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

Change-Id: I71099743cb369e47a87eece1b2dddd70a26c6aba
tree: e3502fd4e690463268ebb066881d2cacb9a9e871
  1. android/
  2. dist/
  3. CleanSpec.mk
  4. README.version