| commit | ebc351d22eca8d2c566bc5e6283ee590597e8fb9 | [log] [tgz] |
|---|---|---|
| author | Daniel Cashman <dcashman@google.com> | Tue Jul 28 18:14:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 28 18:14:30 2015 +0000 |
| tree | d3a1eab1ec9cc427c06b0f404610fd080f6f9540 | |
| parent | 4434fb3e80a9c8252957d85a6ca26ae89467889e [diff] | |
| parent | 3479690727062c7930138a2928838f98b4d4b067 [diff] |
am 34796907: am ddd85c18: Merge "resolve merge conflicts of 950a898 to lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev * commit '3479690727062c7930138a2928838f98b4d4b067': CTS test for PingPongRoot vulnerability