| commit | f52769a685f81f396ead5403c0099a840f410f7c | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Tue May 09 23:40:58 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 09 23:40:58 2017 +0000 |
| tree | 9e3b9c05e0c982db8af283a50cc121b59befad94 | |
| parent | 3994897e7dcf322f7eba64fe49afa806846b71e3 [diff] | |
| parent | 16e19d9aef3a4121b43d36db82d72affbd15ccca [diff] |
Merge "trusty*: Android.mk -> Android.bp" am: e732d15337 am: 1e0a523d68 am: 16e19d9aef Change-Id: I4351a26bfbf6785f0cf13729ae01facc01ff2c56