Merge "DO NOT MERGE - fix FTS3 column pointer handling" into mnc-dev am: 13ee0c2a64 am: f3cda0f0b8 am: 7449e9209e am: cc5c1b86d6  -s ours am: e24d236e50 am: 8fee765504 am: 0b61aeb44e am: c5c3de6f1d am: d22c17f1fe  -s ours
am: 4aedd1f2cd

Change-Id: I9d093bb97c4879da4ee55efcba39133a346c4309
tree: b5266517d1dded5a2f24a60a094b1ad93794f258
  1. android/
  2. dist/
  3. Android.bp
  4. CleanSpec.mk
  5. OWNERS
  6. README.version