| commit | 677ab8ccc0d4116a48fb13820c0e4fec5bb7d445 | [log] [tgz] |
|---|---|---|
| author | Matthew Maurer <mmaurer@google.com> | Fri May 17 00:36:30 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 17 00:36:30 2019 -0700 |
| tree | 0d1a00ded7fd59975c87a4e72608abe5cdde633b | |
| parent | 83d121451b7ad06241de6a53dcf63bd159b33eae [diff] | |
| parent | 95d6553d58d23e35e7aa5fc3764f5dbc3ffb8600 [diff] |
Merge "Use SHA_2_256 for importWrappedKey" am: 0ce3156f97 am: b2a847aea7 am: 0690156c0d am: 95d6553d58 Change-Id: I382b31256d6a70c4791bdb438fed61ebd50be1f5