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