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

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