tree d3100f55781eaabcc57efe3b590bdc62990b58f9
parent d35ff9c09d5225c098d6d4db16087fda4eca4e8e
parent 5e7bb29cf8abafe41208d8029f5c99c12c5f83eb
author JP Sugarbroad <jpsugar@google.com> 1500915925 +0000
committer android-build-merger <android-build-merger@google.com> 1500915925 +0000

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

Change-Id: I3b9a43cbaaaea548079d20bfd822cf91efe74f6c