tree 3b6645233ed4f490e9724da0eafa5d51b37898e4
parent 914211413517fe6e24b4a164b6ff79ca7b2c157a
parent 7bd1fb2ee6999258f259e58248cada5c4481d207
author Unsuk Jung <unsuk@google.com> 1412934338 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412934338 +0000

am 7bd1fb2e: am 24d39459: am 9a0d27b9: am b812960d: am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case   testQueryExternalMiniThumbnails failure" into jb-dev

* commit '7bd1fb2ee6999258f259e58248cada5c4481d207':
  Fix CTS case   testQueryExternalMiniThumbnails failure