[automerger skipped] Merge "Apply security patch to sqlite 3.18." into oc-dev
am: 28c3d3b2f5 -s ours
am skip reason: change_id Iad8c3d1d74d8591a75a4c033c8bf9d3956d2fe4f with SHA1 e86e209f72 is in history

Change-Id: I578fb4d7bd790554fd5e0098a81c5cb8c788b753
tree: a377f546df29e7576ebcc7e4fa69f6c48cf4ce97
  1. android/
  2. dist/
  3. Android.bp
  4. CleanSpec.mk
  5. OWNERS
  6. README.version