tree 52e98894b6e760d942fc27abbc54b763fe8a2ee4
parent 6fac0351cebf84cf9505246e1fec5d74a1fa49c0
parent 82cc1c5a2d279bce4d4ce83a68613633f9ff8be2
author Jeff Tinker <jtinker@google.com> 1417826045 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417826045 +0000

am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev

* commit '82cc1c5a2d279bce4d4ce83a68613633f9ff8be2':
  Unhide secure stop APIs