OSDN Git Service

Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev
authorAdrian Roos <roosa@google.com>
Tue, 5 Sep 2017 18:55:47 +0000 (18:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 5 Sep 2017 18:55:47 +0000 (18:55 +0000)
am: d57edb708f

Change-Id: I385acf93d60bfbc98f39aa0178018e3976a39974


Trivial merge