tree a0bbf61888864f1d0ecfd751d19bfea23d7e4566
parent 899825c55ed153ae5392901e1cfb08bb05b0c12d
parent 1524e625067da52e1365e4f939d4683edeea2fd5
author Mike Lockwood <lockwood@google.com> 1340755313 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340755313 -0700

am 1524e625: am 7017d51e: Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev

* commit '1524e625067da52e1365e4f939d4683edeea2fd5':
  MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes