OSDN Git Service

Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev
authorSteven Ng <stevenckng@google.com>
Tue, 16 May 2017 21:18:12 +0000 (21:18 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 16 May 2017 21:18:13 +0000 (21:18 +0000)
commita2af16bb34d5b6ce5054a12051feb187f397a253
tree55527317a6c1f853761a2c5410be1ab071faa505
parent611fda4a97a13c85a696a393e8f582e0dcde8e8f
parent14153fd25b4757add2107d35e71fcfbb55c1e419
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev