OSDN Git Service

Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev am: a2af16bb34...
authorSteven Ng <stevenckng@google.com>
Tue, 16 May 2017 21:43:13 +0000 (21:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 May 2017 21:43:13 +0000 (21:43 +0000)
commit470dc125c857fd4f3d39ed338a16e42b9c73721e
tree458813dabd3164ca8bd9b06480e3605550ca5ec3
parent6962c1841da1b007e0e4719d38b0633c887f83c3
parent25e02bc80cbc3f187e862e91216f8e1799e43b57
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev am: a2af16bb34  -s ours am: dde4d49385  -s ours
am: 25e02bc80c  -s ours

Change-Id: I877a362643f92257fe2d741e4a2c9db3606f15d0