Merge "DO NOT MERGE - fix FTS3 column pointer handling" into mnc-dev am: 13ee0c2a64 am: f3cda0f0b8 am: 7449e9209e
am: cc5c1b86d6  -s ours

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