am a44d2d1e: am 39ed5163: Camera: Fix green JPEGs
authorEino-Ville Talvala <etalvala@google.com>
Fri, 17 May 2013 03:50:45 +0000 (20:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 May 2013 03:50:45 +0000 (20:50 -0700)
* commit 'a44d2d1e3a66d93b2be5bb11ab05b886d70099d1':
  Camera: Fix green JPEGs


Trivial merge