| commit | 46c74f30bb8708920907fb3565a02fca43502266 | [log] [tgz] |
|---|---|---|
| author | Jocelyn Bohr <bohr@google.com> | Tue Apr 11 19:49:33 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 11 19:49:33 2017 +0000 |
| tree | 2dae658e8a887e55e3a3140e07ec2e9a698e63e9 | |
| parent | dee66f5072aefbc9d093a0361d2c14f91a0f8fc4 [diff] | |
| parent | e3a75840938da4526c23187ff8f3290280160ab7 [diff] |
Merge changes from topic 'trusty_km2_hal' am: a4b40020ef am: e53621c1f2 am: 31e27b7bea am: e3a7584093 Change-Id: I7c514641e98d5e502831f86ad526bd025fa3efb7