tree 3820e7068c144e586da8face68a3a88f7846ad35
parent fe823efdaefded080ae1c6c97bd8e3416e373b03
parent f9510e32625ba37d7a7590e20232154f689a621a
author Denis Hsu <denis.hsu@mediatek.com> 1577412213 -0800
committer android-build-merger <android-build-merger@google.com> 1577412213 -0800

Merge "Consistently use CLOCK_MONOTONIC for timing encryption"
am: f9510e3262

Change-Id: I6eb165b5e9214eb614434ecfa654cfcd22327af1