| commit | 6496c3757b09811b5e63ab70c48573c10d9e0b94 | [log] [tgz] |
|---|---|---|
| author | Steven Ng <stevenckng@google.com> | Tue May 16 21:33:53 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 16 21:33:53 2017 +0000 |
| tree | 55527317a6c1f853761a2c5410be1ab071faa505 | |
| parent | a2af16bb34d5b6ce5054a12051feb187f397a253 [diff] | |
| parent | e05ef08a8e4127a33e94d3e939ce92b9018825c8 [diff] |
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours Change-Id: I19d1bacf055fb660d4ce829222662abfafb9c4a8