summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Tim Murray <timmurray@google.com> 2014-02-14 23:56:57 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-02-14 23:56:57 +0000
commit8e30d53b6575a08ec0579fb08c8c4f055598d78b (patch)
treea1c4a7ae9de3eda977867b1ee70369b0fc95f8c8 /libs/androidfw/AssetManager.cpp
parent4f4161442d1ac6c1a519a06df0e4efeab3072195 (diff)
parent4870c813fe4a6fc7a176f22b5e7f96e9f7a4e469 (diff)
am 4870c813: am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."
* commit '4870c813fe4a6fc7a176f22b5e7f96e9f7a4e469': Fix destruction issues relating to AllocationAdapter.
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions