summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2014-09-26 08:28:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-26 08:28:29 +0000
commit5f5d0544454f062c1f37acad1a72d8c47b4a32b2 (patch)
treedbbc8fc86de106a08d9bb89103dda48d09bc17e3 /media
parent0ed72488feba74904d25ebc91bda60c6b1d0af55 (diff)
parentb5bd1df2d6c78f8db5e7f6b416353ca8a93b7119 (diff)
downloadframeworks_av-5f5d0544454f062c1f37acad1a72d8c47b4a32b2.zip
frameworks_av-5f5d0544454f062c1f37acad1a72d8c47b4a32b2.tar.gz
frameworks_av-5f5d0544454f062c1f37acad1a72d8c47b4a32b2.tar.bz2
Merge "Camera1 shim: If there's no flash, the keys need to be null." into lmp-dev
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions