tree c11079e94ba87e90ddbe74322bfe9f41e042248d
parent 5fa013ea79066ec47589f38f94f557d021bd56eb
parent 7ed62fb4a7401adc3e8b4e082bcfa21de443ebbe
author Jeff Tinker <jtinker@google.com> 1415242151 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415242151 +0000

am 7ed62fb4: am 19a3f69d: Merge "Add missing secure stop methods" into lmp-mr1-dev

* commit '7ed62fb4a7401adc3e8b4e082bcfa21de443ebbe':
  Add missing secure stop methods