| commit | fc194d725367e08ca7e54d0a42d9d586b83d150c | [log] [tgz] |
|---|---|---|
| author | Janis Danisevskis <jdanis@google.com> | Thu Aug 01 17:57:27 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 01 17:57:27 2019 -0700 |
| tree | 877a7ff86fdd0475a03dc56344d51d9e4f41bdcc | |
| parent | 1a87751cdcfcab8f89e9f0d0be45d43848bb6c0a [diff] | |
| parent | e341fff2219823f1469b8c03d080b2168325c6b7 [diff] |
Merge "Keymaster should be developed on AOSP" am: aac806ae5b am: e341fff221 Change-Id: I617d3983bb7e0f99ae2ff227ce4a8bc30038001e