summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | * Remove default librariesDan Willemsen2017-09-281-6/+0
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libdl is part of system_shared_libs now. -ldl -lpthread -lm are now defaults for host_ldlibs on Linux and Darwin. -lrt is a default for host_ldlibs on Linux. Test: m host Change-Id: I35ac5cc20f6f67ee93dc49767527d0f6f8476681 Exempt-From-Owner-Approval: build system cleanup
* | | | | Merge "Fix false positives comparing local and intl numbers"Francisco Pimenta2017-09-184-60/+307
|\ \ \ \ \
| * | | | | Fix false positives comparing local and intl numbersFrancisco Pimenta2017-07-184-60/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when comparing local phone numbers with international it was possible to match the wrong number because the first digit of the area code was being treated as a skippable trunk digit, e.g: "550-123-4567" would be considered equal to "+14501234567". Since there are two different algorithms (loose/old and strict) there are two solutions with the same basic goal: Only ignore mismatches if there's an actual extra digit which could possibly be the trunk digit, i.e: "0550-123-4567" is acceptable as equal to "+15501234567". NB: The US not having a trunk digit to begin with is a different issue entirely - the code is agnostic on which country has which trunk digits! For "loose" matching we achieve this by checking the length of the mismatch. For "strict" matching we keep track of the supposed trunk digit and compare it against the current position in match. So for the above example 5 != 4. Several new unit tests were added (including replicating tests for OldPhoneNumberUtils). I broke down the c++ tests into smaller methods for additional readability. NB: By adding more tests I uncovered that two digit trunk prefixes were never handled correctly for the "strict" matching case. "Loose" matching is much more robust. I commented out the "strict" test cases. Test: All unit tests pass for PhoneNumberUtilsTest, OldPhoneNumberUtilsTest and DatabaseGeneralTest. Bug: 63179537 Bug: 63178542 Bug: 62916088 Change-Id: Idc2a1c2c2f64ed29995208503de4755c521e1c82
* | | | | | Merge "ICU is disabled by Android.bp" am: 5ed153d271 am: 4d17a2b346 am: ↵Jiyong Park2017-09-080-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90de50e46c -s ours am: 3e2e063819 -s ours Change-Id: I6509ff424c6479effd26f08505926dc8825136c6
| * | | | | Merge "ICU is disabled by Android.bp" am: 5ed153d271 am: 4d17a2b346Jiyong Park2017-09-080-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | am: 90de50e46c -s ours Change-Id: Icd0ecfc07d4e3e2fce4236d9cd4e6018fb6e0e00
| | * | | | Merge "ICU is disabled by Android.bp" am: 5ed153d271Jiyong Park2017-09-085-42/+13
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | am: 4d17a2b346 Change-Id: I65d2b6e8e176ebccb898fd09ff8d143a7dc2803c
| | | * | | Merge "ICU is disabled by Android.bp"Jiyong Park2017-09-085-42/+13
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | am: 5ed153d271 Change-Id: Idea3fd58e296f27ceb57336acf5d3d1f4fb685c4
| | | | * | Merge "ICU is disabled by Android.bp"Treehugger Robot2017-09-085-42/+13
| | | | |\ \
| | | | | * | ICU is disabled by Android.bpJiyong Park2017-09-075-42/+13
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using vendor.cflags, SQLITE_ENABLE_ICU is on/off from Android.bp. No need to def/undef it inside the source code. Bug: 64514237 Test: BOARD_VNDK_VERSION=current m -j libsqlite libsqlite.vendor Merged-In: If9771fa020e528445275281017e424a5bbc2ae99 Change-Id: If9771fa020e528445275281017e424a5bbc2ae99 (cherry picked from commit 633397eeef296584d3242d8a72790dcf11bb36fd)
* | | | | | Merge "Mark libsqlite as vendor_available" am: 9247c1167e am: 810542669a am: ↵Jiyong Park2017-09-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00a6f84c92 -s ours am: 7e04d3d3ee -s ours Change-Id: Ic04a25ddd0807a94918ca74fe65b03bca1938c73
| * | | | | Merge "Mark libsqlite as vendor_available" am: 9247c1167e am: 810542669aJiyong Park2017-09-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 00a6f84c92 -s ours Change-Id: I985bd7f0fd6d589db7c51c06f4defa44b9e4bb20
| | * | | | Merge "Mark libsqlite as vendor_available" am: 9247c1167eJiyong Park2017-09-061-1/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 810542669a Change-Id: I2c997f77d1c9235dbe00b96a1382fd5d828b5298
| | | * | | Merge "Mark libsqlite as vendor_available"Jiyong Park2017-09-061-1/+2
| | |/| | | | | | |/ / | | | | | | | | | | | | | | | | | | | | am: 9247c1167e Change-Id: I8b299975608f95a0c6a381c31d8af74c127f3d8e
| | | * | Merge "Mark libsqlite as vendor_available"Treehugger Robot2017-09-061-1/+2
| | | |\ \
| | | | * | Mark libsqlite as vendor_availableJiyong Park2017-09-051-1/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some vendor libs that are using libsqlite. So marking it as vendor_available. Bug: 37560614 Test: BOARD_VNDK_VERSION=current m -j libsqlite.vendor Change-Id: I45823c4d42071f505583a955564cdd78742e8029 Merged-In: I45823c4d42071f505583a955564cdd78742e8029
* | | | | sqlite: Upgrade to SQLite 3.19.4 release am: fb51fcc8c0Fyodor Kupolov2017-08-215-9/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6889d928d6 Change-Id: I5aaf95c281ef8ad9bbf5e26fc7af3461959204cc
| * | | | sqlite: Upgrade to SQLite 3.19.4 releaseFyodor Kupolov2017-08-215-9/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fb51fcc8c0 Change-Id: I9d9d699362054a20447f1f9b3833f39bbf3015c2
| | * | | | sqlite: Upgrade to SQLite 3.19.4 releaseFyodor Kupolov2017-08-185-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Downloaded from https://sqlite.org/src/tarball/SQLite-605907e7.tar.gz $ shasum SQLite-605907e7.tar.gz 4ac33e2ce69553fdb929e394823267a604b19211 SQLite-605907e7.tar.gz Unpack and run "./configure; make sqlite3.c" to generate the "sqlite3.c", "sqlite3.h", "shell.c", and "sqlite3ext.h" source files dist/orig contains the stock sqlite3 code, as generated from the tar.gz file above. This update simply switches from batch-atomic-write-3.19 branch to an official release. No code changes. Test: manual Bug: 64849849 Change-Id: Ibbf0bca7ec498a670487adf8f0ffbfa19a44bbbf
* | | | | | Merge "Don't use ICU when built for vendors" am: fc6bb57693 am: ed6a0cb1f1 ↵Jiyong Park2017-08-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 52697317fc am: dc3bc74d12 -s ours am: ac5167c4ee -s ours Change-Id: I7e46f39b1fe3b8bbea5a74fd655b8466c2685b46
| * | | | | Merge "Don't use ICU when built for vendors" am: fc6bb57693 am: ed6a0cb1f1 ↵Jiyong Park2017-08-180-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 52697317fc am: dc3bc74d12 -s ours Change-Id: Ia441f2964ed84e47c9c836299a3f58bfeff4c781
| | * | | | Merge "Don't use ICU when built for vendors" am: fc6bb57693 am: ed6a0cb1f1Jiyong Park2017-08-185-11/+70
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 52697317fc Change-Id: I1f2004db571421051bd781f254cf5cfed3bd305d
| | | * \ \ \ Merge "Don't use ICU when built for vendors" am: fc6bb57693Jiyong Park2017-08-185-11/+70
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | am: ed6a0cb1f1 Change-Id: Ic488129f7d38fd5a337f3d4bcb419ffc6660a7ae
| | | | * | | Merge "Don't use ICU when built for vendors"Jiyong Park2017-08-185-11/+70
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fc6bb57693 Change-Id: I4b95599ba8257a3fb2983eccde1e338f79046c0c
| | | | | * \ \ Merge "Don't use ICU when built for vendors"Treehugger Robot2017-08-185-11/+70
| | | | | |\ \ \
| | | | | | * | | Don't use ICU when built for vendorsJiyong Park2017-08-105-11/+70
| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libicuuc.so isn't available for vendors, thus ICU is turned off when libsqlite is built for vendors. Bug: 64104535 Test: BOARD_VNDK_VERSION=current m -j libsqlite.vendor Merged-In: I682502ba5bdc5f76a0363a95d01b1081c1bc01a4 Change-Id: I682502ba5bdc5f76a0363a95d01b1081c1bc01a4 (cherry picked from commit b4076dfd66f114263a1f70cf3ba73c2d55ccb3b0)
* | | | | | | | ICU is disabled by Android.bp am: 633397eeefJiyong Park2017-08-125-39/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6ff5f124df Change-Id: Idc87129d3e22154d774b8e588c0b420c6ea7001c
| * | | | | | | ICU is disabled by Android.bpJiyong Park2017-08-125-39/+10
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 633397eeef Change-Id: I2078828774384292db5e28a6b89bf24b6d24c2c7
| | * | | | | | ICU is disabled by Android.bpJiyong Park2017-08-115-39/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using vendor.cflags, SQLITE_ENABLE_ICU is on/off from Android.bp. No need to def/undef it inside the source code. Bug: 64514237 Test: BOARD_VNDK_VERSION=current m -j libsqlite libsqlite.vendor Change-Id: If9771fa020e528445275281017e424a5bbc2ae99
* | | | | | | | Don't use ICU when built for vendors am: b4076dfd66Jiyong Park2017-08-105-11/+69
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f08847cbb1 Change-Id: I76a6b9997cee81b355898011660999364d29d6c2
| * | | | | | | Don't use ICU when built for vendorsJiyong Park2017-08-105-11/+69
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b4076dfd66 Change-Id: I54f182e03f862d42cb5f40e9107fdc5b7261a255
| | * | | | | | Don't use ICU when built for vendorsJiyong Park2017-08-105-11/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libicuuc.so isn't available for vendors, thus ICU is turned off when libsqlite is built for vendors. Bug: 64104535 Test: BOARD_VNDK_VERSION=current m -j libsqlite.vendor Change-Id: I682502ba5bdc5f76a0363a95d01b1081c1bc01a4
* | | | | | | | sqlite: Upgrade to SQLite 3.19.4 am: a0540df799Fyodor Kupolov2017-08-036-191/+137
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 098030b2f9 Change-Id: I62660ba55d8e80b1c14b41c0bbb40cf2b355047b
| * | | | | | | sqlite: Upgrade to SQLite 3.19.4Fyodor Kupolov2017-08-036-191/+137
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a0540df799 Change-Id: I5deaa80ece82163fb47e4bbc0570bbaba708a335
| | * | | | | | sqlite: Upgrade to SQLite 3.19.4Fyodor Kupolov2017-08-026-191/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Downloaded from https://sqlite.org/src/tarball/SQLite-2dd0c77d.tar.gz $ shasum SQLite-2dd0c77d.tar.gz 354575e725f1301ed52984bd06d7b803b2134f5a SQLite-2dd0c77d.tar.gz Unpack and run "./configure; make sqlite3.c" to generate the "sqlite3.c", "sqlite3.h", "shell.c", and "sqlite3ext.h" source files dist/orig contains the stock sqlite3 code, as generated from the tar.gz file above. This release provides a fix for https://sqlite.org/src/info/de3403bf5ae5f72ed The proposed solution makes column names more consistent and easier to understand. It also makes the implementation smaller and simpler and helps it to run a little faster. However, there may be legacy programs that depended on the old behavior (shifting the column naming rule from (2) to (3) when using the query flattener) and those legacy programs could potentially break due to this change. Test: manual + SQLiteDatabaseTest CTS test Bug: 62431773 Change-Id: I44f9bafe888b22b040fa1827962c421b4eab0c3a
* | | | | | | | Merge "sqlite: Upgrade to SQLite 3.19.3 [batch-atomic-write] [NO PARTIAL ↵Fyodor Kupolov2017-08-017-213/+677
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RERUN]" into oc-mr1-dev am: 03856f0cb8 am: c3a247a26e Change-Id: I92598897df555ab19fc232b765d0fd4dcccebbc9
| * | | | | | | Merge "sqlite: Upgrade to SQLite 3.19.3 [batch-atomic-write] [NO PARTIAL ↵Fyodor Kupolov2017-08-017-213/+677
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RERUN]" into oc-mr1-dev am: 03856f0cb8 Change-Id: Iddd6f91b6ced80f8fa95083360d55b5b53083145
| | * | | | | | Merge "sqlite: Upgrade to SQLite 3.19.3 [batch-atomic-write] [NO PARTIAL ↵Fyodor Kupolov2017-08-017-213/+677
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | RERUN]" into oc-mr1-dev
| | | * | | | | | sqlite: Upgrade to SQLite 3.19.3 [batch-atomic-write] [NO PARTIAL RERUN]Fyodor Kupolov2017-08-017-213/+677
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Downloaded from https://sqlite.org/src/tarball/SQLite-def55027.tar.gz $ shasum SQLite-def55027.tar.gz 5872660422a1ef8211f57f96f7c8507279a376f7 SQLite-def55027.tar.gz Unpack and run "./configure; make sqlite3.c" to generate the "sqlite3.c", "sqlite3.h", "shell.c", and "sqlite3ext.h" source files dist/orig contains the stock sqlite3 code, as generated from the tar.gz file above. dist contains a copy of dist/orig, but with the Android.patch file applied. Please see Android.patch for a list of differences between stock and Android. Experimental changes from batch-atomic-write-3.19 branch https://sqlite.org/src/info/def55027b1f1db9c With this enhancement, SQLite automatically omits the rollback journal and uses the atomic write capabilities of F2FS when it can. When F2FS atomic write is used, we find that transactions are about 3x faster compared with an ext4 filesystem on the same SSD device. Test: manual + SQLiteDatabaseTest CTS test Bug: 64149514 Change-Id: I920f435748fa1d773be161f3264626d33b11edfd
* | | | | | | | | Merge "Revert "Mark the module as VNDK or VNDK-SP in Android.bp"" into ↵Justin Yun2017-07-281-3/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | oc-mr1-dev am: 5ee55e3cc6 am: 6f92a021d3 Change-Id: Iced0452ca70727fc425ea17a2f22ef57935ce456
| * | | | | | | | Merge "Revert "Mark the module as VNDK or VNDK-SP in Android.bp"" into ↵Justin Yun2017-07-281-3/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | oc-mr1-dev am: 5ee55e3cc6 Change-Id: Ie8b31d675596a2e286336ea928b40ab22e6ff7b7
| | * | | | | | | Merge "Revert "Mark the module as VNDK or VNDK-SP in Android.bp"" into ↵TreeHugger Robot2017-07-281-3/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | oc-mr1-dev
| | | * | | | | | | Revert "Mark the module as VNDK or VNDK-SP in Android.bp"Justin Yun2017-07-281-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8390cd3c29b799dc69479ca63dd254d8e7583f01. To build with BOARD_VNDK_VERSION=current, the modules have to be merged with the postorder in dependency tree. Otherwise, soong will report VNDK dependency error. This will be reverted and merged later. Change-Id: Ifcb119e30c06183b4f9c74da21a5ca68bf93ce9d
* | | | | | | | | | Merge "Mark the module as VNDK or VNDK-SP in Android.bp" into oc-mr1-dev am: ↵Justin Yun2017-07-271-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb2e1a6ca3 am: 6b8c051c84 Change-Id: I31c9547cbb41d13a69d8abf0b5b2a8eba9f83add
| * | | | | | | | | Merge "Mark the module as VNDK or VNDK-SP in Android.bp" into oc-mr1-devJustin Yun2017-07-271-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: eb2e1a6ca3 Change-Id: I9b74b1711a6d11320299a2062c4408f38ec5ef16
| | * | | | | | | | Merge "Mark the module as VNDK or VNDK-SP in Android.bp" into oc-mr1-devTreeHugger Robot2017-07-271-0/+3
| | |\| | | | | | | | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Mark the module as VNDK or VNDK-SP in Android.bpJustin Yun2017-07-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a VNDK/VNDK-SP module, Android.bp must have 'vndk' tag as well as 'vendor_available: true'. For a VNDK module, the 'vndk' tag has 'enabled: true'. It will be installed system/lib(64)/vndk as a vendor variant. For a VNDK-SP module, the 'vndk' tag has 'support_system_process: true' as well as 'enabled: true'. It will be installed system/lib(64)/vndk-sp as a vendor variant. Bug: 63866913 Test: build and boot with BOARD_VNDK_VERSION=current Change-Id: Id239ac4eabfdbd4e016707f4052fc180b2767512
* | | | | | | | | Merge "DO NOT MERGE - fix FTS3 column pointer handling" into mnc-dev am: ↵JP Sugarbroad2017-07-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13ee0c2a64 am: f3cda0f0b8 am: 7449e9209e am: cc5c1b86d6 -s ours am: e24d236e50 am: 8fee765504 am: 0b61aeb44e am: c5c3de6f1d am: d22c17f1fe -s ours am: 4aedd1f2cd am: a53dfe88cc am: 11cbf1c954 am: f89617d690 -s ours Change-Id: Ief072d19400b7c3b3f074f4f2632f6e528c29e9d
| * | | | | | | | Merge "DO NOT MERGE - fix FTS3 column pointer handling" into mnc-dev am: ↵JP Sugarbroad2017-07-250-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13ee0c2a64 am: f3cda0f0b8 am: 7449e9209e am: cc5c1b86d6 -s ours am: e24d236e50 am: 8fee765504 am: 0b61aeb44e am: c5c3de6f1d am: d22c17f1fe -s ours am: 4aedd1f2cd am: a53dfe88cc am: 11cbf1c954 Change-Id: Ie26734e88910ab9540ed481e424d69f3592ac3a8
| | * | | | | | | Merge "DO NOT MERGE - fix FTS3 column pointer handling" into mnc-dev am: ↵JP Sugarbroad2017-07-250-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13ee0c2a64 am: f3cda0f0b8 am: 7449e9209e am: cc5c1b86d6 -s ours am: e24d236e50 am: 8fee765504 am: 0b61aeb44e am: c5c3de6f1d am: d22c17f1fe -s ours am: 4aedd1f2cd am: a53dfe88cc Change-Id: I7c526f0bf1691c49d4aebe2ea0feadf659bcc964
* | | | | | | | | | DO NOT MERGE - fix FTS3 column pointer handling am: 2f5d96a741 am: ↵JP Sugarbroad2017-07-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e44e09e7d am: 79d1e1f4e2 -s ours am: 6ae19d4de8 -s ours am: 2a5985621a am: 8129fd1b52 -s ours am: f5f93b5f44 am: 60b77e7c63 am: 183259951c am: cf9e262833 -s ours am: ae7306c451 am: a03f33ca45 am: 4604adb4a2 am: b8b9cf5a83 am: 6bc929f3e5 -s ours am: 065e78b93e am: 3d7cb79be1 am: 64c79a4afa am: 758644bc3e -s ours Change-Id: I6e98ab754caee68f687811f8f9369e1b9b1770c3