am a3f1b508: am 25da9375: Merge "MtpDatabase: Fix typo affecting parent and format queries" into jb-mr1-dev
am a3f1b508: am 25da9375: Merge "MtpDatabase: Fix typo affecting parent and format queries" into jb-mr1-dev

* commit 'a3f1b5086bfee67ef2efd4398381af99e314855e':
  MtpDatabase: Fix typo affecting parent and format queries

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base