summaryrefslogtreecommitdiffstats
path: root/services/java/com/android
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2013-11-14 18:20:53 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-14 18:20:53 -0800
commit8d1e86d054c9d2a9bdec2a0c9d454ddf21768031 (patch)
tree029d4f2ffb0d00806056303fd20fa1585b8d043f /services/java/com/android
parent2bced6dcb53c1743d6d11ffcb213206a07a63737 (diff)
parent1907c0d280d97776708810c9d24931aa6f818790 (diff)
downloadframeworks_base-8d1e86d054c9d2a9bdec2a0c9d454ddf21768031.zip
frameworks_base-8d1e86d054c9d2a9bdec2a0c9d454ddf21768031.tar.gz
frameworks_base-8d1e86d054c9d2a9bdec2a0c9d454ddf21768031.tar.bz2
am 1907c0d2: Merge "Don\'t show external presentation until keyguard actually shows" into klp-dev
* commit '1907c0d280d97776708810c9d24931aa6f818790': Don't show external presentation until keyguard actually shows
Diffstat (limited to 'services/java/com/android')
0 files changed, 0 insertions, 0 deletions