summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2013-10-01 23:10:53 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-10-01 23:10:53 -0700
commitb8aa12273f91b4b2689ceca5029da58d8f307bee (patch)
tree5dd42fbc626236060c78661d050e36dc3433dd80 /libs/androidfw/ObbFile.cpp
parent4c9110fcfcf1771a78716ade70f12a1fae3eb18c (diff)
parentaf85c03deb3506cebebd1719df4bfb844505fc9d (diff)
am af85c03d: am b9edb3a2: Merge "Fix issue #10971287: Make ACCESS_BATTERY_STATS permission system or signature." into klp-dev
* commit 'af85c03deb3506cebebd1719df4bfb844505fc9d': Fix issue #10971287: Make ACCESS_BATTERY_STATS permission system or signature.
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions