summaryrefslogtreecommitdiffstats
path: root/telephony/java/com
diff options
context:
space:
mode:
authorDan Sandler <dsandler@android.com>2015-03-06 00:31:04 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-06 00:31:04 +0000
commiteef3fbcf6825a5e5e0cb150123d9bc87956fbb23 (patch)
treefdf536b235334fb660d8e21000288b5a74b13479 /telephony/java/com
parent7a79c4cac3b0c722832e868346db2375b6d6c379 (diff)
parent8deb6d95a73d5d6860fbfb2eb273cdbc49c5d2c9 (diff)
downloadframeworks_base-eef3fbcf6825a5e5e0cb150123d9bc87956fbb23.zip
frameworks_base-eef3fbcf6825a5e5e0cb150123d9bc87956fbb23.tar.gz
frameworks_base-eef3fbcf6825a5e5e0cb150123d9bc87956fbb23.tar.bz2
am 8deb6d95: am e6a4b445: am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
* commit '8deb6d95a73d5d6860fbfb2eb273cdbc49c5d2c9': Avoid crashing on startup when policy forbids lockscreen camera.
Diffstat (limited to 'telephony/java/com')
0 files changed, 0 insertions, 0 deletions