commit | 83b417bf0732cd06e2a22f22933a5278d89f3d3e | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon May 20 08:26:24 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 20 08:26:24 2013 -0700 |
tree | 55c1615b1b1f64d54e58adac9275ecf9cbf0bd04 | |
parent | 4b6df88e969042d5a1b0a49d3929f60e1af5fb92 [diff] | |
parent | e15285c1fa96c9e3c3dacbe8f1a2e25b7be299f1 [diff] |
am e15285c1: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'e15285c1fa96c9e3c3dacbe8f1a2e25b7be299f1': Camera: Fix green JPEGs