| commit | a1c98021c04325a10d9da5c49feb115bec6e4912 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Fri Jun 26 23:40:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 26 23:40:44 2015 +0000 |
| tree | 939c35eec646aeff1516d65288bc596423a53ff8 | |
| parent | c154abec4375bf46ece9ed114db16faf2481dc30 [diff] | |
| parent | 293facf4bf5b05c043e33589d17df6f1ad1ade26 [diff] |
am 293facf4: (-s ours) am ad6a2da8: am 2da8a992: am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. * commit '293facf4bf5b05c043e33589d17df6f1ad1ade26': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.