| commit | 0c90ead26194a3a5351abbbcc6280d35f431c78b | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Mon Oct 14 10:51:04 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 14 10:51:04 2013 -0700 |
| tree | c0e4b6736e10ba5cf557c5743ca90c01b12e77b7 | |
| parent | 2d9b69b7a3f3ee38cc884ad4be653176dfc2cc82 [diff] | |
| parent | 12e9f699130458e39d15becf05f993c7429a38fa [diff] |
am 12e9f699: (-s ours) am 914970b4: am d38b1302: Merge "DO NOT MERGE: Hide new camera API." into klp-dev * commit '12e9f699130458e39d15becf05f993c7429a38fa': DO NOT MERGE: Hide new camera API.