tree 99af900840fb105487e46856663e3704dd2c676a
parent 4a04f010ac01c2acf66b438503a57392c2fbacbb
parent b812960d3bf386e07b3f18da92adbb74dd416933
author Unsuk Jung <unsuk@google.com> 1432829628 +0000
committer android-build-merger <android-build-merger@google.com> 1432829628 +0000

am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case   testQueryExternalMiniThumbnails failure" into jb-dev
automerge: b812960

* commit 'b812960d3bf386e07b3f18da92adbb74dd416933':
  Fix CTS case   testQueryExternalMiniThumbnails failure