| commit | 5c3edc045b270ff32e0adaa20bd4cbb541d6b73a | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Sep 28 23:49:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 28 23:49:46 2015 +0000 |
| tree | 51b9a35466ea972368ecc88325764a50c14537a9 | |
| parent | 3a28bb145c7367068985a0c585cba0d581e705ff [diff] | |
| parent | 98da13bbd2db4b2247b90d83deec5e8befbee536 [diff] |
am 98da13bb: resolved conflicts for 6c3bf1b8 to stage-aosp-master * commit '98da13bbd2db4b2247b90d83deec5e8befbee536': Use zip -q for adding shared libraries