| commit | 001c1dbec2a1d36c52a8db97d147421c319cc2ce | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Tue Jun 30 19:45:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 19:45:14 2015 +0000 |
| tree | 51d033f41e68d3159023f4a31c94b18752335b70 | |
| parent | 8919b9457bbe8077997094f279a33515553a7a90 [diff] | |
| parent | 0d69454e2249cd395aa33a55d6b208a98aaea3fc [diff] |
am 0d69454e: am e2550667: (-s ours) am bff09c93: am f7e6aeea: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. * commit '0d69454e2249cd395aa33a55d6b208a98aaea3fc': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.