summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Benjamin Franz <bfranz@google.com> 2015-06-29 10:39:20 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-06-29 10:39:20 +0000
commit635e4ffcf65bef9cde34a62583ee6dac49cb2592 (patch)
tree0818b21d133be8f1a6acb3aee16d1ac104079301 /libs/androidfw/ZipFileRO.cpp
parent5cf3d76e98172f8bf2fc02fa5dbf028c07747c60 (diff)
parentb6fb3fe8f4fce5fda82a833247bd99ec435815f1 (diff)
am b6fb3fe8: Merge "Block assist when screenshots are disabled by policy" into mnc-dev
* commit 'b6fb3fe8f4fce5fda82a833247bd99ec435815f1': Block assist when screenshots are disabled by policy
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions