tree a377f546df29e7576ebcc7e4fa69f6c48cf4ce97
parent 0d233fa3ebb130d1d1904fc3a1a6f341094d1fe1
parent 33da7f5e000ff3b92923c052614565a1dabc030f
author JP Sugarbroad <jpsugar@google.com> 1501015026 +0000
committer android-build-merger <android-build-merger@google.com> 1501015026 +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 am: 1227791261  -s ours
am: 33da7f5e00

Change-Id: Iea150990f4b6016a0ba11259ae31d0077deb1e4b