tree 1fab99323bf0236b855cd514f24fcdbbcd908987
parent 7496e153f4308b39df9c53615770f44f593c3504
parent 9edf7ad563ead119698ac3106b699515bd160ffe
author Amit Mahajan <amitmahajan@google.com> 1435356864 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435356864 +0000

am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

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