tree 5cb0168ee7d652b8059eb2a1c8470e36e070621b
parent 72fb793f529087ec717a5e68e8fbbc9f29d97e11
parent 96ef6f1bb8c5832682a9576c0e43b6c85e4f5c1b
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