OSDN Git Service

Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
authorMaurice Lam <yukl@google.com>
Tue, 21 Jul 2015 23:40:02 +0000 (23:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 21 Jul 2015 23:40:02 +0000 (23:40 +0000)

Trivial merge