tree 3020ad7810706fc9b8818fef079ad9a415e0cbe4
parent 17bce268903e17dd70c36a3430fb30a44c82af8a
parent f1f3961cdafa1ba368b5f4b1dbab1e16e85dbfb1
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582215199 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582215199 +0000

Merge "Match timestamp units with the interface definitions" into qt-qpr1-dev am: f1f3961cda

Change-Id: I1907bfd6f6adf0458e4382622b01eb11dc7cad21