tree 111052a559b659c10c2d2c3f7b1a0131f9f35969
parent 0b842f79fb6bd43a31a7027c69501dc655a8080e
parent 545d8fbaaf1d84941743c43c4079e65cf062c4ec
author Chih-Hung Hsieh <chh@google.com> 1506718216 +0000
committer android-build-merger <android-build-merger@google.com> 1506718216 +0000

Merge "Use -Werror in external/sqlite" am: 0d42d6b303
am: 545d8fbaaf

Change-Id: I39d7dc0fa3b764239dc5312d17a4f7df5df34659