OSDN Git Service

Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791...
authorSteven Ng <stevenckng@google.com>
Tue, 16 May 2017 21:43:48 +0000 (21:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 May 2017 21:43:48 +0000 (21:43 +0000)
commitfd72a955c4cdad5dff0a461e4254f45efc2ac5f2
tree458813dabd3164ca8bd9b06480e3605550ca5ec3
parent470dc125c857fd4f3d39ed338a16e42b9c73721e
parent17bb961066f199da35c9d40cf64b94c63de75388
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e  -s ours am: 6496c3757b  -s ours am: 00266d056c  -s ours
am: 17bb961066  -s ours

Change-Id: I650ce37d934f2ca30f5d5bd3122593f0c4553b50