| commit | 0d69454e2249cd395aa33a55d6b208a98aaea3fc | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Tue Jun 30 18:21:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 18:21:52 2015 +0000 |
| tree | 3c24523d3c93ddbfae10dfb987513943f2dc045e | |
| parent | 2a12d29ba2fedfa8f96b346a9f2d9a2a789923f0 [diff] | |
| parent | e2550667d6360208c27ed316ca6a549d8209a614 [diff] |
am e2550667: (-s ours) am bff09c93: am f7e6aeea: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. * commit 'e2550667d6360208c27ed316ca6a549d8209a614': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.