| commit | 45e50f87bb2b2cd11b19ee102223c03356d77042 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Tue Jun 30 21:55:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 21:55:08 2015 +0000 |
| tree | 61f947a68ea348baefa94eaed274f4d131a90e90 | |
| parent | f1f720b607ef6150f79095e2dd7ab1e62fc03c10 [diff] | |
| parent | 71699d760eff662055dde458ea0d614a32fb6dfc [diff] |
am 71699d76: 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 '71699d760eff662055dde458ea0d614a32fb6dfc': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.