OSDN Git Service

am 899d0a28: (-s ours) am e44ceed1: Merge "[ScreenLock] Update illustration during...
authorMaurice Lam <yukl@google.com>
Thu, 27 Aug 2015 11:33:43 +0000 (11:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:33:43 +0000 (11:33 +0000)
commit3d09fef6f3484d90803af5ad60b586a9d13dccf0
tree7f84c40aaa75cd61f165f55c1ed04452351a1edd
parentbc23f8e87fc8b698cfdd20ef17fafa17f674e4a8
parent899d0a28943ad7a797c6b8bf6bd1695cc6694f84
am 899d0a28: (-s ours) am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev

* commit '899d0a28943ad7a797c6b8bf6bd1695cc6694f84':