| commit | 22ee5119b4b914c45683517113ecda87226cb4e8 | [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 | a70d32f5c1088905c10e1da8985b6b46d317ff51 [diff] | |
| parent | f52769a685f81f396ead5403c0099a840f410f7c [diff] |
Merge "trusty*: Android.mk -> Android.bp" am: e732d15337 am: 1e0a523d68 am: 16e19d9aef am: f52769a685 -s ours Change-Id: Ia209c93766b78f979263bfa67e94f527de761835