| commit | 9eeb954d39d742310a362a1f073d2576f5738761 | [log] [tgz] |
|---|---|---|
| author | Steven Ng <stevenckng@google.com> | Wed May 17 21:01:46 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 17 21:01:46 2017 +0000 |
| tree | 6dab200d45f5ecd5e521e6abff1ae0a32907e9cd | |
| parent | 56870f438cc235fa2b88a69f2bfabd6de820c4b0 [diff] | |
| parent | 6496c3757b09811b5e63ab70c48573c10d9e0b94 [diff] |
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours am: 6496c3757b -s ours Change-Id: I1032e8ad372d0f5cff35e1a1f018ceecedf9bff2