tree 89bb51ce21d459f8eb006079d25b8058189f9816
parent be2860699bea17c77bbea2a41813f6a32f9fabfc
parent 453875843b5856a0ad0485e4248a56b329587e71
author Android Build Merger (Role) <android-build-merger@google.com> 1499296112 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499296112 +0000

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