tree 91efa05c3b600b48f2be5db2dff143cf3b5269cd
parent 5a181a2436fb629c2298b9bfb0b2848b514edbe6
parent b15a57d64d39315a9c1331d74a1ff5821f8b14d1
author Jeff Tinker <jtinker@google.com> 1418067359 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418067359 +0000

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

* commit 'b15a57d64d39315a9c1331d74a1ff5821f8b14d1':
  Unhide secure stop APIs