| commit | 50a02f3c822adf6917cf0aa81de4228a5b577f81 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Tue Jun 30 21:29:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 21:29:01 2015 +0000 |
| tree | da875cfe97fb51e19d1404c4e739b0e9164cd0d9 | |
| parent | 735dff748c2ccc46b68e85e294777781670e913b [diff] | |
| parent | e1f4e0bc202159bed756622dada87663360d24ae [diff] |
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 'e1f4e0bc202159bed756622dada87663360d24ae': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.