| commit | 1c864dae1710da39b38b96dfa37e2343db0cc260 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Mon Aug 20 20:03:39 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 20 20:03:39 2018 -0700 |
| tree | ea455d501f94aa790b7880cf2797f438c6c0858d | |
| parent | b8485526c499c5bbfa6297987e33f9a12f45a4ff [diff] | |
| parent | bdf816899c4c50d51a74a302b6c2cf3629c4243e [diff] |
[automerger skipped] Merge "Add back keymaster@4.0 hash." into pie-vts-dev am: 6a20e646e4 am: 51a56c5a11 -s ours am: 61016c8f5d -s ours am: bdf816899c Change-Id: I72e13bc02906b31eb592bc0e257c116c799eaff3