| commit | 3479690727062c7930138a2928838f98b4d4b067 | [log] [tgz] |
|---|---|---|
| author | Daniel Cashman <dcashman@google.com> | Tue Jul 28 17:49:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 28 17:49:13 2015 +0000 |
| tree | 73a959d79101b72221d65acb4b8ac1a9715bf562 | |
| parent | d466d2d10261bfa976633bf3ba65cf738390dc88 [diff] | |
| parent | ddd85c18bcc9e141d725cd469e0773618927e217 [diff] |
am ddd85c18: Merge "resolve merge conflicts of 950a898 to lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev * commit 'ddd85c18bcc9e141d725cd469e0773618927e217': CTS test for PingPongRoot vulnerability