am 5d4fa740: am 17071e43: Fix JPEG thumbnail size check.
authorRuben Brunk <rubenbrunk@google.com>
Mon, 27 Oct 2014 04:21:09 +0000 (04:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 04:21:09 +0000 (04:21 +0000)
* commit '5d4fa740b14c1b6cf2f3ea7eeba0fae57884cc16':


Trivial merge