| commit | 0ab97863428b891ddab439cbd5ecb33aeae3df93 | [log] [tgz] |
|---|---|---|
| author | Jocelyn Bohr <bohr@google.com> | Tue Apr 11 17:44:13 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 11 17:44:13 2017 +0000 |
| tree | 0acb12fbb7ece9f8162a0a77bc6fb43359cc3482 | |
| parent | 4d062dca46adb2ca1def989cf01cd6d881a2bf6f [diff] | |
| parent | 05bfc113c81cedb62dd03162566bf8c9e38f826a [diff] |
Merge changes from topic 'trusty_km2_hal' am: a4b40020ef am: e53621c1f2 am: 31e27b7bea Change-Id: Ifee1161f086718e617562209b5b2282239909991