| commit | 00bf7582faa3395729ed0aa7db8d08cfca225842 | [log] [tgz] |
|---|---|---|
| author | Daniel Cashman <dcashman@google.com> | Wed Aug 05 18:27:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 05 18:27:30 2015 +0000 |
| tree | 8bb98c4a2d91ab76b49f1c738ff3f80bd19a869a | |
| parent | 9877b7d85d008c136866d9ce62acfcaa34c4dc14 [diff] | |
| parent | ebc351d22eca8d2c566bc5e6283ee590597e8fb9 [diff] |
am ebc351d2: am 34796907: am ddd85c18: Merge "resolve merge conflicts of 950a898 to lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev * commit 'ebc351d22eca8d2c566bc5e6283ee590597e8fb9': CTS test for PingPongRoot vulnerability