summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2013-10-02 09:37:10 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-10-02 09:37:10 -0700
commit0f7f648f1af70bdc69ac93d1af12aefcdda0523d (patch)
tree8844337390f4f75ca884bdc6eec33589993ed12b /libs/androidfw/ObbFile.cpp
parent6d7de848d7c4f8c6556c05dab79eb532874a82b3 (diff)
parent9601b51cd96b99ff7e016e09f3c25d3b59f56602 (diff)
am 9601b51c: am 42544cf8: Merge "Track wireless charger detector timeout explicitly." into klp-dev
* commit '9601b51cd96b99ff7e016e09f3c25d3b59f56602': Track wireless charger detector timeout explicitly.
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions