tree d3a1eab1ec9cc427c06b0f404610fd080f6f9540
parent 4434fb3e80a9c8252957d85a6ca26ae89467889e
parent 3479690727062c7930138a2928838f98b4d4b067
author Daniel Cashman <dcashman@google.com> 1438107270 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438107270 +0000

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