OSDN Git Service

Merge "OMS: rebase settings when overlays update" into pi-dev am: 203b7b1792
authorTodd Kennedy <toddke@google.com>
Fri, 11 May 2018 18:53:09 +0000 (11:53 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 May 2018 18:53:09 +0000 (11:53 -0700)
commit4fa4eeb6754e8a2a08071e5a8768e36b6ac40a43
treefccd02534da32dcfa71de561193c5605fb5c68d1
parentb02c4a18fc3bdb3bfc8f48243c3fbe9825bab50e
parent45d58cab2c90281e882707667216f8eec18a3b5a
Merge "OMS: rebase settings when overlays update" into pi-dev am: 203b7b1792
am: 45d58cab2c

Change-Id: Iab503a1196a7412d101e4c5c7831785bf5fd18bb
tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java