tree b9b1c1ae69f662116d9c72397e4d8584e08a4580
parent a2988bd0f50fbeb15b8bbf6828b3c4857e7a43cc
parent 6a1c13721bee123b726e5bccabede571385d1dae
author Unsuk Jung <unsuk@google.com> 1412874539 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412874539 +0000

am 6a1c1372: am 4bc52341: Merge "Fix CTS case   testQueryExternalMiniThumbnails failure" into jb-dev

* commit '6a1c13721bee123b726e5bccabede571385d1dae':
  Fix CTS case   testQueryExternalMiniThumbnails failure