commit | a560a1b35fe4837634995084d15a571361225123 | [log] [tgz] |
---|---|---|
author | Steven Moreland <smoreland@google.com> | Mon Aug 20 18:10:38 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Aug 20 18:10:38 2018 -0700 |
tree | 93ac94386c5b647e757f003232d44c7c62c41031 | |
parent | 0a6b9d9ea44b382344ea2cfe677b77c4f40361eb [diff] | |
parent | 313379462a0a3856e6c3155db7ddd99f22949cde [diff] |
Merge "Add back keymaster@4.0 hash." into pi-dev am: 095e15e000 am: 313379462a Change-Id: Iaec48d8fc165c25ee782db1f333b85b2871fe3cc