summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Alan Viverette <alanv@google.com> 2014-11-05 04:50:50 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-11-05 04:50:50 +0000
commit6a98dde8dffac83283850afaec4400db9146a3e5 (patch)
tree56ee2e1996362ab1f8ca8a77f0cc705b641522cc /libs/androidfw/ZipFileRO.cpp
parent53a5acd096e222e5cbab94dfa5d4c5fde257d7f7 (diff)
parent9342b049b9a605b1904e03f904ec3cbf90f7742d (diff)
am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev
* commit '9342b049b9a605b1904e03f904ec3cbf90f7742d': Use default token instead of wrapped window manager
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions