tree c468c16f1bea102c43cb94e3e6f10d33ea72cb87
parent 0f945bf81afb5e7bac7a51bf708d515426d52c55
parent 052a0727f45b2d8bebdc0c82562310f0af568b3b
author Amit Mahajan <amitmahajan@google.com> 1435364363 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435364363 +0000

am 81cb70fa: (-s ours) am f3cd2a7c: am a1c98021: am 293facf4: (-s ours) am ad6a2da8: am 2da8a992: am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

* commit '81cb70fa2e022d1ab23043b7071b719e4cb51d3f':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.