commit | a5be9e3c080d6d176ff79e8963718b97057f1543 | [log] [tgz] |
---|---|---|
author | Eino-Ville Talvala <etalvala@google.com> | Mon Nov 24 18:12:10 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 24 18:12:10 2014 +0000 |
tree | 68b4d9810ac9c1721d1d98a8add26bdffc126ae6 | |
parent | 84436ec0ba1a398530fcb0cde43e9cd8cdd4fabc [diff] | |
parent | 6086365e41e0e1656e8bfffdf4b70f897f080994 [diff] |
am 6086365e: am 9c08f6c8: Merge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev * commit '6086365e41e0e1656e8bfffdf4b70f897f080994': Camera: Add XML entries and files for new system features