tree 9c07cc6589340473cea9273429a548088d4e427f
parent 290ca1ec3b9596be6433fd8bb5b2e5f8081755b5
parent 386f09235d650ae586ee3c5b681b98fc5c2a4ce9
author Robert Snoeberger <snoeberger@google.com> 1561601212 -0700
committer android-build-merger <android-build-merger@google.com> 1561601212 -0700

Merge "Disable ClockOptionsProvider so clocks don't appear in picker app" into qt-dev
am: 386f09235d

Change-Id: I30eea455326096557e6fcce98a29daec2720ce9e