commit | 6a9bd242334af0554a15c7ac01fcf6c1228049ef | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 27 02:37:50 2019 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 27 02:37:50 2019 +0000 |
tree | cbf787ec74f3eb8704aadf15e199a248fc3541c7 | |
parent | da4d63eaff5fea8b4bf1ff2135a6d9e98ffb0d57 [diff] | |
parent | 61f5d1e3994b40f2330a7f9b2b8bb148a696edc0 [diff] |
Merge "Consistently use CLOCK_MONOTONIC for timing encryption" am: f9510e3262 am: 395c47e046 am: 61f5d1e399 Change-Id: Ie78c05e0857b980215c237520d4e8f04e376e74e