summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2013-10-01 18:50:42 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-10-01 18:50:42 -0700
commit9601b51cd96b99ff7e016e09f3c25d3b59f56602 (patch)
treee05e85eb48bb8842cc22faec842feee2a18d0720 /libs/androidfw/ObbFile.cpp
parent1fc9eb78ab7009250be52a79de5acab108a37312 (diff)
parent42544cf843a8e6a3d6ecf57aafdc5a3591a16d17 (diff)
am 42544cf8: Merge "Track wireless charger detector timeout explicitly." into klp-dev
* commit '42544cf843a8e6a3d6ecf57aafdc5a3591a16d17': Track wireless charger detector timeout explicitly.
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions