| commit | e810a84d8770950fa54c50f609d684068c3a9b47 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Tue Jun 30 19:45:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 19:45:09 2015 +0000 |
| tree | d6b13d97b38101ac599924ae7bb1696fa7521aab | |
| parent | 59982e0d3aae9c628dccda14250536db4f81998f [diff] | |
| parent | 7213edfe7bd88608cd31d9d5ecadd649166bad28 [diff] |
am 7213edfe: am b10c73b1: (-s ours) am afb60bbc: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. * commit '7213edfe7bd88608cd31d9d5ecadd649166bad28': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.