commit | e1f4e0bc202159bed756622dada87663360d24ae | [log] [tgz] |
---|---|---|
author | Amit Mahajan <amitmahajan@google.com> | Tue Jun 30 20:16:59 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 20:16:59 2015 +0000 |
tree | beb9c1c168d7d67c3f49eef40d5eb9637f759e09 | |
parent | c64048a299d3df87be9a81ee24c48e6fa74184d3 [diff] | |
parent | 5b105d54676166a66c97526be0bcde9d29e3a1cb [diff] |
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 '5b105d54676166a66c97526be0bcde9d29e3a1cb': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.