| commit | e05ef08a8e4127a33e94d3e939ce92b9018825c8 | [log] [tgz] |
|---|---|---|
| author | Steven Ng <stevenckng@google.com> | Tue May 16 21:30:54 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 16 21:30:54 2017 +0000 |
| tree | 68fc394042be9822f44ff411a3851963b2f219f5 | |
| parent | 7f1bc85e4cfd453a4496539d3ec190f06df83537 [diff] | |
| parent | c07f39c791264cf078f23f240311d5ae079b4fdb [diff] |
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 Change-Id: I00f92abcf2acd828ab8e81ed0053f7afd9f0d994