| commit | 1a1e030c739921d15b39d4f4352d0035b227fd13 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Tue Jun 30 22:03:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 22:03:19 2015 +0000 |
| tree | 1e6c585d5d89ff80afb79fb4ff1e5d712aa8b44a | |
| parent | 4d78f80d151f9b4bf7dd414912bfba005c824b1f [diff] | |
| parent | 50a02f3c822adf6917cf0aa81de4228a5b577f81 [diff] |
am 50a02f3c: am e1f4e0bc: am 5b105d54: am 001c1dbe: am 0d69454e: am e2550667: (-s ours) am bff09c93: am f7e6aeea: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. * commit '50a02f3c822adf6917cf0aa81de4228a5b577f81': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.