| commit | 60a819c26e150960c81697adfb24cabe58d88673 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Tue May 09 22:43:47 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 09 22:43:47 2017 +0000 |
| tree | 93861828c44bdc8a76a48ecac0de93bbcde1eb0e | |
| parent | 666df25bad6eff8437812dd107684e3136017e71 [diff] | |
| parent | 3c938915e976c97f42b102d897ed4702ce0d9149 [diff] |
Merge "trusty*: Android.mk -> Android.bp" am: e732d15337 Change-Id: Ie1e78fe387312f16aeee17d818999e9cc12d9ef9