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