| commit | 5b105d54676166a66c97526be0bcde9d29e3a1cb | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Tue Jun 30 20:00:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 20:00:18 2015 +0000 |
| tree | beb9c1c168d7d67c3f49eef40d5eb9637f759e09 | |
| parent | 904df6dbf4f3c917d9ed3620ffbb8e7e0a108bdb [diff] | |
| parent | 001c1dbec2a1d36c52a8db97d147421c319cc2ce [diff] |
am 001c1dbe: am 0d69454e: am e2550667: (-s ours) am bff09c93: am f7e6aeea: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. * commit '001c1dbec2a1d36c52a8db97d147421c319cc2ce': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.