OSDN Git Service

Merge "Use buttons for EncryptionInterstitial" into oc-dev
authorMaurice Lam <yukl@google.com>
Tue, 18 Apr 2017 01:01:43 +0000 (01:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Apr 2017 01:01:43 +0000 (01:01 +0000)
am: b6a0360a92

Change-Id: I07ac891f736ba3707b01b629732df4a963ab64cc


Trivial merge