summaryrefslogtreecommitdiffstats
path: root/core/java/android/debug
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-04-12 18:18:45 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-12 18:18:45 -0700
commit67ae551272f2bc8ffe83ecd62e970f657dc965d5 (patch)
tree8d38b0feaf8a45217ef47d8811bbb14a947ada30 /core/java/android/debug
parentcbba37c6096486cbc8ce6f0c4eb7df9a352d54b1 (diff)
parentff5b158f69bf453cf1fdedd175a09482c65f2bf2 (diff)
downloadframeworks_base-67ae551272f2bc8ffe83ecd62e970f657dc965d5.zip
frameworks_base-67ae551272f2bc8ffe83ecd62e970f657dc965d5.tar.gz
frameworks_base-67ae551272f2bc8ffe83ecd62e970f657dc965d5.tar.bz2
Merge "Keep activities stopped while the lock screen is up."
Diffstat (limited to 'core/java/android/debug')
0 files changed, 0 insertions, 0 deletions