tree 3e43a57f59f0b0ea18af998cdbf53a6779d64f18
parent 4db526ffd25430bbe498402523c43dddb4dbbadf
parent 950a8988a198ac8f6d3e6be4bfe5c797f01689a7
author Daniel Xie <dxie@google.com> 1442893577 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442893577 +0000

am 950a8988: Merge "CTS test for PingPongRoot vulnerability" into lollipop-cts-dev

* commit '950a8988a198ac8f6d3e6be4bfe5c797f01689a7':
  CTS test for PingPongRoot vulnerability