summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Griff Hazen <griff@google.com> 2014-01-27 18:35:37 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-01-27 18:35:37 +0000
commitbca57ee556c26cd3eaeccab43ec3ddda39d287fa (patch)
treeb2b9f09e332a80e23e0ade19e491638446ddfca5 /libs/androidfw/AssetManager.cpp
parenta0c6260705c841f501282e0e337970ca9a00e064 (diff)
parente2bb257c349b21f68e3b9b87eb7cabd205380082 (diff)
am e2bb257c: Merge "Make MANAGE_ACTIVITY_STACKS a signature|system permission." into klp-modular-dev
* commit 'e2bb257c349b21f68e3b9b87eb7cabd205380082': Make MANAGE_ACTIVITY_STACKS a signature|system permission.
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions