diff options
author | Paul Crowley <paulcrowley@google.com> | 2019-01-29 15:17:23 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-01-29 15:17:23 -0800 |
commit | ddf391d46b6fa52c237a99b11269134efe3b25cf (patch) | |
tree | db451c93020aa8a9987b1655b0216ca8e5aa4ad1 /libs/hwui/renderthread/RenderThread.cpp | |
parent | 3e8a69cd9d192479b44efb95753c7660e8485f3e (diff) | |
parent | 930efcaf19add36d443f60203a2ac804ee85e01e (diff) |
[automerger skipped] Merge "v3 keys use SP800 derivation" into pi-dev am: 83924aca2c
am: 930efcaf19 -s ours
am skip reason: change_id Ia5bdc9acaa8d37605088abcfb0037581eb6494c2 with SHA1 0d40d6e787 is in history
Change-Id: Idab71018ff09c4c962716078a5c472598f8568c6
Diffstat (limited to 'libs/hwui/renderthread/RenderThread.cpp')
0 files changed, 0 insertions, 0 deletions