tree 70a7c3db47416c72dbcf5ae7686335c586700c0d
parent 2ebd318ccb6b91da85d6b491484d32b23ee58495
parent c08c2c431a368c92186d5c603573579f4417471c
author Android Build Merger (Role) <android-build-merger@google.com> 1499298037 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499298037 +0000

Merge "Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master am: 42d194ee03" into oc-dev-plus-aosp am: 8bbf3cad1e" into oc-dr1-dev-plus-aosp am: bc4d25986e"