commit | 61f5d1e3994b40f2330a7f9b2b8bb148a696edc0 | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 27 02:21:36 2019 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 27 02:21:36 2019 +0000 |
tree | 3820e7068c144e586da8face68a3a88f7846ad35 | |
parent | 270e041a14daae1cd9dc88375ae28cfa20590fff [diff] | |
parent | 395c47e0468c66cc5a3b1f855f4470948f7a70ee [diff] |
Merge "Consistently use CLOCK_MONOTONIC for timing encryption" am: f9510e3262 am: 395c47e046 Change-Id: I5aa535a2dc31bce130c1e48c8a3cf9bdc1a8b238