tree 19167eb8c5541a89c69bb7fe4f71a86b7987d285
parent a81efa0bec9dcd80afdaaf624514bc6fad1a79cb
parent f8fa49b52f560750f30ec1273887c8dec109a2ae
author Marc Hittinger <trojal@google.com> 1506121949 +0000
committer android-build-merger <android-build-merger@google.com> 1506121949 +0000

Merge "Update Quick Settings Disclosure for watch." into oreo-cts-dev
am: f8fa49b52f

Change-Id: Ifb76499c0a2608a9fe3e1017bb82f2bfa78547b6