tree ac14beed859ded703a4825df86e7f3e52a8b5e68
parent 3bcd1e1443dd0e86a249987d6787fa1df8b2eb7f
parent 52eef9c59303a731cd1767df54bd9d2183f51cb0
author Amit Mahajan <amitmahajan@google.com> 1435389138 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435389138 +0000

am 52eef9c5: am f6fd0d1e: am 4d78f80d: am 735dff74: am c64048a2: am 904df6db: Merge commit \'8919b945\' into manualmerge

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