| commit | 8363104782302c08f2f03d4e1e345edb7f20876c | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Tue Jun 30 20:00:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 20:00:00 2015 +0000 |
| tree | 0a4fef832ba58aa188d78b771571539fe4d6a74b | |
| parent | f1686ac225c75991d931348818065f9e99cf0b73 [diff] | |
| parent | 22766e85d8b7bbedaa28a409f34120c4f3d4a2d3 [diff] |
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 '22766e85d8b7bbedaa28a409f34120c4f3d4a2d3': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.