tree e96c140e7788031733b3b786cae7860acb25b029
parent 0b47cd2e60dcc8e7d2013c4f06184857e298e779
parent 8d7ff9af54b44c49a4423d3237f50b9742752760
author TreeHugger Robot <treehugger-gerrit@google.com> 1589774824 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1589774824 +0000

Merge "Disable ClockOptionsProvider" into rvc-dev am: 6c66c29f89 am: 581c891294 am: 8d7ff9af54

Change-Id: Ia3058d3eacb221bb7dd379c4a7f3c9a6c149aea9