summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res
diff options
context:
space:
mode:
authorBenjamin Franz <bfranz@google.com>2015-06-29 10:29:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-29 10:29:23 +0000
commitb6fb3fe8f4fce5fda82a833247bd99ec435815f1 (patch)
treeab4f2c6708aabdbfb070daff81442924a51d633a /packages/SystemUI/res
parent1ea7a819315ddaa104099229b2b32f75d08a50be (diff)
parentc200f44c46b7d6ddb104c0f09f2a4c679e218d0b (diff)
downloadframeworks_base-b6fb3fe8f4fce5fda82a833247bd99ec435815f1.zip
frameworks_base-b6fb3fe8f4fce5fda82a833247bd99ec435815f1.tar.gz
frameworks_base-b6fb3fe8f4fce5fda82a833247bd99ec435815f1.tar.bz2
Merge "Block assist when screenshots are disabled by policy" into mnc-dev
Diffstat (limited to 'packages/SystemUI/res')
0 files changed, 0 insertions, 0 deletions