OSDN Git Service

am 462ec104: am 30a03425: (-s ours) am 0063e0bc: Merge "Disable Keyguard affordances...
authorAdrian Roos <roosa@google.com>
Thu, 27 Aug 2015 18:27:34 +0000 (18:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:27:34 +0000 (18:27 +0000)
commit85424180acdd46325b9382bb344ae4aa3d7123c1
treedac0c3e7fb56a41aecac39e4e0713ea791d15008
parent79ff1ea524568414fdcc893c272bf82ad5c5e357
parent462ec1042f4755db6cb40d32b27a513912c1f56b
am 462ec104: am 30a03425: (-s ours) am 0063e0bc: Merge "Disable Keyguard affordances before setup is completed" into mnc-dev

* commit '462ec1042f4755db6cb40d32b27a513912c1f56b':