summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/Activity.java
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2014-09-05 13:51:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-05 13:51:37 +0000
commitf9fb30f54b04135f2b148d9ce105cdf7e6a279b3 (patch)
tree6714208316589566e519454bf33294e02cb2ba53 /core/java/android/app/Activity.java
parent4c866929d778d103e9e1cd102ed05761c032e676 (diff)
parentda30a03d96346a9c02463095f5efbf4a64bfac6d (diff)
downloadframeworks_base-f9fb30f54b04135f2b148d9ce105cdf7e6a279b3.zip
frameworks_base-f9fb30f54b04135f2b148d9ce105cdf7e6a279b3.tar.gz
frameworks_base-f9fb30f54b04135f2b148d9ce105cdf7e6a279b3.tar.bz2
Merge "Hide notifications when occluded and disabled on keyguard" into lmp-dev
Diffstat (limited to 'core/java/android/app/Activity.java')
0 files changed, 0 insertions, 0 deletions