tree 44cf811598578ca6412bcc035c6dfc00c8d48277
parent 0b2c379b02c366931ed50fd3324a5ab9aa9f0b4d
parent d5f58b0f39148ed2f5ff7fca23946eb123e0787b
author Unsuk Jung <unsuk@google.com> 1432830658 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432830658 +0000

am d5f58b0f: am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case   testQueryExternalMiniThumbnails failure" into jb-dev automerge: b812960 automerge: 8013ee6 automerge: 4659b16 automerge: 8d6ba40

* commit 'd5f58b0f39148ed2f5ff7fca23946eb123e0787b':