tree 1a68d6c21091a6b32c510e944303984f9652c06a
parent edfa5ed28d69f93099e20633d87510b0057bf988
parent 65e0123ced0a1891fc66e631de5ba3d1d5a515bf
author Jeff Tinker <jtinker@google.com> 1366215804 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366215804 -0700

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

* commit '65e0123ced0a1891fc66e631de5ba3d1d5a515bf':
  Added CTS test for secure stop APIs