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


Trivial merge