| commit | d13e164941a155e0e105d43aa8847dcd4c940d66 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Wed May 10 02:40:53 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 10 02:40:53 2017 +0000 |
| tree | 5f8c4981d066a01729465ec34fe8eedb26042ce5 | |
| parent | b45a94884a12d0ce6e11a56de0024bac80af5a79 [diff] | |
| parent | e2faf14e39ec135330d8c9bef392a890991b0514 [diff] |
Merge "trusty*: Android.mk -> Android.bp" am: e732d15337 am: 1e0a523d68 am: 16e19d9aef am: f52769a685 -s ours Change-Id: Ia209c93766b78f979263bfa67e94f527de761835