| commit | 43d3bd027604f400caf49826e5b4705784937b35 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Tue Jun 30 20:11:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 20:11:48 2015 +0000 |
| tree | 3d2f84890ed5fc4fd699d9790fd66db2b602959d | |
| parent | 72356f0b20d4e6d84430629c2bb7d8baac55002d [diff] | |
| parent | 8363104782302c08f2f03d4e1e345edb7f20876c [diff] |
am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. * commit '8363104782302c08f2f03d4e1e345edb7f20876c': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.