| commit | b096476cf96a19fa1614c59722df0875fcd76e38 | [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 | ed457ba87f435c27e0d9d2af37205f9ad144fb47 | |
| parent | e199e7cca23756815e6185395fa92ccf8205fe09 [diff] | |
| parent | c5fdd44c0d6dda7fb1eee336ed09fc413857b643 [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.