commit | f106c86c2f0c990cf4184a82cc93e7f4973b9706 | [log] [tgz] |
---|---|---|
author | Jocelyn Bohr <bohr@google.com> | Tue Apr 11 17:04:45 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Apr 11 17:04:45 2017 +0000 |
tree | 855a2a120ee744b8c5228082004bb61ff8583dc4 | |
parent | f0336927db0e67d05283aab0cf9c9c43f01dbd2b [diff] | |
parent | 9b83886e32fd4c18985ad370eb28968da7033705 [diff] |
Merge changes from topic 'trusty_km2_hal' am: a4b40020ef Change-Id: I31e2ef8b8a41876cc6c2288abde798e261d00247