| commit | 82c88cf9c02adfde5c0df6dd58b5c7fe3a44e522 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Fri Jul 03 16:47:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 03 16:47:59 2015 +0000 |
| tree | 5f74c4f8f34f3ac55de076a46e4b0f6081a93fd1 | |
| parent | 674deac7152140560fccdfc802b99df3683266dc [diff] | |
| parent | 2e502b2382f518272c50808b95286abfef460df1 [diff] |
am 2e502b23: (-s ours) am 8c43602a: am 4b2d7061: am 45e50f87: (-s ours) 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 '2e502b2382f518272c50808b95286abfef460df1': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.