| commit | 71699d760eff662055dde458ea0d614a32fb6dfc | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Tue Jun 30 21:40:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 21:40:32 2015 +0000 |
| tree | 597c48726eefd82c8f4e8e782a2f71001ec1a5aa | |
| parent | cbbbabaa4aa1cbb84cb49133ecda1da2f06daf54 [diff] | |
| parent | 95c47354a6841d7ae3a81fcacea5acdd25dc42c6 [diff] |
am 95c47354: am 43d3bd02: 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 '95c47354a6841d7ae3a81fcacea5acdd25dc42c6': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.