tree d206c9f41d63d85827f8addd320149e95c5ea571
parent 9ac6ff1df80bb2f3d4eaec61ccfeb7b4e5ab1493
parent 9e0727caf75049f17f8237efa159cd4baf699de7
author Jeff Tinker <jtinker@google.com> 1366215614 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366215614 -0700

am 9e0727ca: Merge "Added CTS test for secure stop APIs" into jb-mr2-dev

* commit '9e0727caf75049f17f8237efa159cd4baf699de7':
  Added CTS test for secure stop APIs