summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Nicolas Prevot <nprevot@google.com> 2015-06-29 11:38:58 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-06-29 11:38:58 +0000
commit26b5ec6bddb7ae406eda74c7a539195a5520b6b8 (patch)
tree81b435a19b22d5d09ccd29d6e8715f20b1740df0 /libs/androidfw/ZipFileRO.cpp
parent635e4ffcf65bef9cde34a62583ee6dac49cb2592 (diff)
parentf1fff7976937d92bc7e0014d54cb071a509975dc (diff)
am f1fff797: Merge "Add flag FLAG_ACTIVITY_RESET_TASK_IF_NEEDED in LauncherAppsService." into mnc-dev
* commit 'f1fff7976937d92bc7e0014d54cb071a509975dc': Add flag FLAG_ACTIVITY_RESET_TASK_IF_NEEDED in LauncherAppsService.
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions