| commit | 31e27b7bea9c0b854da6691ab9510148272f0485 | [log] [tgz] |
|---|---|---|
| author | Jocelyn Bohr <bohr@google.com> | Tue Apr 11 17:15:32 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 11 17:15:32 2017 +0000 |
| tree | 855a2a120ee744b8c5228082004bb61ff8583dc4 | |
| parent | dacd341a7a27e82a36f319e4a8aaf7fc8cbe33ce [diff] | |
| parent | e53621c1f2f8f686d71fa116c9fa7c7ee2f5272b [diff] |
Merge changes from topic 'trusty_km2_hal' am: a4b40020ef am: e53621c1f2 Change-Id: Ibb4104109c1cf3ded6471246fb6366f929358021