DO NOT MERGE - fix FTS3 column pointer handling am: a378abb509  -s ours am: 5e2ac063eb am: 5a53058d84  -s ours am: 496c77337b am: 7d08705457 am: a5c7ebded0 am: 6c24975ba5  -s ours am: 86cb683a07 am: 93b84b5e71 am: 9c905276c5 am: 5e7bb29cf8 am: 1227791261  -s ours am: 33da7f5e00
am: 95611601e5

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