commit | 3bcd1e1443dd0e86a249987d6787fa1df8b2eb7f | [log] [tgz] |
---|---|---|
author | Amit Mahajan <amitmahajan@google.com> | Fri Jun 26 23:41:21 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 26 23:41:21 2015 +0000 |
tree | ac14beed859ded703a4825df86e7f3e52a8b5e68 | |
parent | d3cc3bf443d16df04d07610837bd37b463c49333 [diff] | |
parent | 7db6f54c86579b753c3de46dc45237415f16a3d6 [diff] |
am 7db6f54c: 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 '7db6f54c86579b753c3de46dc45237415f16a3d6': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.