OSDN Git Service

am 3d09fef6: am 899d0a28: (-s ours) am e44ceed1: Merge "[ScreenLock] Update illustrat...
authorMaurice Lam <yukl@google.com>
Thu, 27 Aug 2015 20:18:04 +0000 (20:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 20:18:04 +0000 (20:18 +0000)
commitdc661005dec53fe789661798536597a8fbfaad8a
tree8c762641adaf526afc25ba999560dbfe888bbd1c
parent8ac1851211c587387cf108c6fe6ecef1253720b5
parent3d09fef6f3484d90803af5ad60b586a9d13dccf0
am 3d09fef6: am 899d0a28: (-s ours) am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev

* commit '3d09fef6f3484d90803af5ad60b586a9d13dccf0':