| commit | 00b3248839205674b692a7464bd6df5777b81e83 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Sep 28 23:54:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 28 23:54:18 2015 +0000 |
| tree | 9ec5dc195f095c44290d6657d9e2506a752dd6c3 | |
| parent | c33665b779f8c2c023fd57af18590070b20848db [diff] | |
| parent | 5c3edc045b270ff32e0adaa20bd4cbb541d6b73a [diff] |
am 5c3edc04: am 98da13bb: resolved conflicts for 6c3bf1b8 to stage-aosp-master * commit '5c3edc045b270ff32e0adaa20bd4cbb541d6b73a': Use zip -q for adding shared libraries