commit | 05bfc113c81cedb62dd03162566bf8c9e38f826a | [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 | da5e6baaaaaa171cf1add93a80c21a1d4f289d0f [diff] | |
parent | f106c86c2f0c990cf4184a82cc93e7f4973b9706 [diff] |
Merge changes from topic 'trusty_km2_hal' am: a4b40020ef am: e53621c1f2 Change-Id: Ibb4104109c1cf3ded6471246fb6366f929358021