| commit | 6ec76899c90e1bdb0b14966c7894e6ae65eea406 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Wed Jul 01 17:51:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 01 17:51:14 2015 +0000 |
| tree | e4107676fd8c425ecc355c4863af67dba835b9c4 | |
| parent | f6fd0d1ef24c6ce4b02df09276a17614e930c25a [diff] | |
| parent | 1a1e030c739921d15b39d4f4352d0035b227fd13 [diff] |
am 1a1e030c: (-s ours) am 50a02f3c: am e1f4e0bc: am 5b105d54: 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 '1a1e030c739921d15b39d4f4352d0035b227fd13': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.