diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2014-09-26 09:49:54 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-26 09:49:54 +0000 |
commit | bedf4b8b4b971e480e671e0762da467cdcad7867 (patch) | |
tree | 9d2378c791fc014e987a416e68d7f49f18a01729 /media | |
parent | 18e10cb19395ba8758d484cb962c9f38e30adba4 (diff) | |
parent | 5f5d0544454f062c1f37acad1a72d8c47b4a32b2 (diff) | |
download | frameworks_av-bedf4b8b4b971e480e671e0762da467cdcad7867.zip frameworks_av-bedf4b8b4b971e480e671e0762da467cdcad7867.tar.gz frameworks_av-bedf4b8b4b971e480e671e0762da467cdcad7867.tar.bz2 |
am 5f5d0544: Merge "Camera1 shim: If there\'s no flash, the keys need to be null." into lmp-dev
* commit '5f5d0544454f062c1f37acad1a72d8c47b4a32b2':
Camera1 shim: If there's no flash, the keys need to be null.
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions