summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware/CameraInfo.java
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2013-11-15 00:42:46 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-15 00:42:46 -0800
commit30cb5c3ffa259f2a6df02a81a766c716477f4b92 (patch)
tree31af3313ad5360a79ac4bdf6df7b49236d83822a /core/java/android/hardware/CameraInfo.java
parent0b342cf8da9feb8c4f1df96b83127bf009e6f96f (diff)
parent2ea480cac89460ee2524cd080e90f6240e8eebf5 (diff)
downloadframeworks_base-30cb5c3ffa259f2a6df02a81a766c716477f4b92.zip
frameworks_base-30cb5c3ffa259f2a6df02a81a766c716477f4b92.tar.gz
frameworks_base-30cb5c3ffa259f2a6df02a81a766c716477f4b92.tar.bz2
am 2ea480ca: am 5d0b18cd: am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev
* commit '2ea480cac89460ee2524cd080e90f6240e8eebf5': Disallow applications from initiating cast screen.
Diffstat (limited to 'core/java/android/hardware/CameraInfo.java')
0 files changed, 0 insertions, 0 deletions