tree 1ff9c096721248018e115e3fb931511ef48a39c8
parent 6bd6b1c436f9da46d01280cb080c2e810c50f390
parent 3c239d7e8d78570b1e17ad968c408506e73a8f3f
author Jeffrey Brown <jeffbrown@android.com> 1360212958 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360212958 -0800

am 3c239d7e: am 8934c575: am 88ba2f48: Merge "Disable usage of WAL in DatabaseHelper"

# By Yevgen Pronenko
# Via Android Git Automerger (2) and others
* commit '3c239d7e8d78570b1e17ad968c408506e73a8f3f':
  Disable usage of WAL in DatabaseHelper