| commit | d2fc692b2362eed62a34343cc7fd23d783401b63 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri May 24 15:30:17 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 24 15:30:17 2013 -0700 |
| tree | 0c02333ed29d89fc75e3ead054b430a6249ec111 | |
| parent | f72ab2aabe32d9acec637556d3633600a9a8b701 [diff] | |
| parent | f35f6ce75375b05634a0acb332635e1954058336 [diff] |
am f35f6ce7: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'f35f6ce75375b05634a0acb332635e1954058336': camera_metadata: Add supportedHardwareLevel field