| commit | 5d4bde894eaa5d6d716e2fc1d5aaca00c1de52a5 | [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 | da2309e3bc7a0567358ba46120ddf68085c4807e [diff] | |
| parent | 60a819c26e150960c81697adfb24cabe58d88673 [diff] |
Merge "trusty*: Android.mk -> Android.bp" am: e732d15337 am: 1e0a523d68 Change-Id: I37655976bb5daa06df4d0896119415a72bc3419d