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