tree b85d23f56d0b8c92141134ec579ab7a2833b46d6
parent 22fd53966c9e9bcfcfdbfb860e2f2519d93d5782
parent c3f64efd42f9f524eab05e01b7171ffc587d5b28
author Amit Mahajan <amitmahajan@google.com> 1435361149 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435361149 +0000

am c3f64efd: am 6d2e7c0f: (-s ours) am aa902abe: am f81c71d6: am 20499eea: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

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