tree 5d88ea36e9f443ee7c52bb2f734a82853c5cae6f
parent 895eb134751ec1495baa30362a514275624e5843
parent 5b8976a5eaffe81a742ec2600cf9b63e911f978c
author Amit Mahajan <amitmahajan@google.com> 1435358099 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435358099 +0000

am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

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