commit | 7213edfe7bd88608cd31d9d5ecadd649166bad28 | [log] [tgz] |
---|---|---|
author | Amit Mahajan <amitmahajan@google.com> | Tue Jun 30 18:21:54 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 18:21:54 2015 +0000 |
tree | bc37ba3093019aab652d8f805db971f8de30eed4 | |
parent | 535355c94efadb73fe7620adbdecd54927bb1399 [diff] | |
parent | b10c73b18ecc62ea17c56559260f674add348154 [diff] |
am b10c73b1: (-s ours) am afb60bbc: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. * commit 'b10c73b18ecc62ea17c56559260f674add348154': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.