tree e3502fd4e690463268ebb066881d2cacb9a9e871
parent b8c15440034e3684234213ef6c55275cdcb452e9
parent d35ff9c09d5225c098d6d4db16087fda4eca4e8e
author JP Sugarbroad <jpsugar@google.com> 1500916054 +0000
committer android-build-merger <android-build-merger@google.com> 1500916054 +0000

DO NOT MERGE - fix FTS3 column pointer handling am: 7d8204e5ca am: 60c85944f7  -s ours am: 5078903e16 am: 0adcdd2a02 am: 3fbf39ee9c am: 754653e051  -s ours am: c7b0f5d627 am: 13601e23bb am: 28d44a2565 am: 149c0db895
am: d35ff9c09d  -s ours

Change-Id: Id538aabbaf5ea8dbaa147c5b62f68de6423ddf67