| commit | bc4d25986e0e94a8fc33067f7c2e9415e8a9f8c4 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Jul 05 23:08:32 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 05 23:08:32 2017 +0000 |
| tree | 89bb51ce21d459f8eb006079d25b8058189f9816 | |
| parent | be2860699bea17c77bbea2a41813f6a32f9fabfc [diff] | |
| parent | 453875843b5856a0ad0485e4248a56b329587e71 [diff] |
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