| commit | 5be2d2af80716c08b8626046df8977dbf925df85 | [log] [tgz] |
|---|---|---|
| author | Rachad Alao <rachad@google.com> | Mon Oct 07 13:46:05 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 07 13:46:05 2013 -0700 |
| tree | a003cc3d2e437681aca27673739fe180013f9792 | |
| parent | ab5cbb7bb58b17936193d6411a9f8c3e6015d9f9 [diff] | |
| parent | 0ed8c93cffec6b4d0c1e86599365074b1b2c3f1f [diff] |
am 0ed8c93c: am 00fb27dd: Merge "Camera2: add metadata override" into klp-dev * commit '0ed8c93cffec6b4d0c1e86599365074b1b2c3f1f': Camera2: add metadata override