OSDN Git Service

am c97e5aba: (-s ours) am d85fafce: Merge "[ScreenLock] Change title of encryption...
authorMaurice Lam <yukl@google.com>
Thu, 27 Aug 2015 11:33:38 +0000 (11:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:33:38 +0000 (11:33 +0000)
commitbe1277653320931d3c30f266a805e0b7bad8d53a
tree7f84c40aaa75cd61f165f55c1ed04452351a1edd
parent63cccf0ee900cef3c8046cbc1002e29977d370d8
parentc97e5aba84835ef126bee9cd4c288b4edb5d97fa
am c97e5aba: (-s ours) am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev

* commit 'c97e5aba84835ef126bee9cd4c288b4edb5d97fa':