OSDN Git Service

am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW...
authorMaurice Lam <yukl@google.com>
Thu, 23 Jul 2015 19:18:51 +0000 (19:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Jul 2015 19:18:51 +0000 (19:18 +0000)
* commit '9b6bd390f97e2c9852d0a6e1ec8f7359a6492f3e':
  [ScreenLock] Style encryption interstitial in SUW


Trivial merge