| commit | 16e19d9aef3a4121b43d36db82d72affbd15ccca | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Tue May 09 22:49:25 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 09 22:49:25 2017 +0000 |
| tree | 40095281238c35d35e6c294a0a3119b34c448c77 | |
| parent | 42996de2dc1b1bbd18dc7b6c1c80dcafa14c69cf [diff] | |
| parent | 1e0a523d684a4e888ce096947be1b4675b146c1e [diff] |
Merge "trusty*: Android.mk -> Android.bp" am: e732d15337 am: 1e0a523d68 Change-Id: I37655976bb5daa06df4d0896119415a72bc3419d