| commit | 8ef2ce1a61d9ce843e388decdd05113432e9050d | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Fri Jun 26 23:53:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 26 23:53:47 2015 +0000 |
| tree | 73901e71a3ddfcf186e51b16c22d160c13f46f57 | |
| parent | 78f1251dc7a6b105bd81090f5620db4b424b4926 [diff] | |
| parent | b096476cf96a19fa1614c59722df0875fcd76e38 [diff] |
am a1c98021: am 293facf4: (-s ours) am ad6a2da8: am 2da8a992: am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. * commit 'a1c98021c04325a10d9da5c49feb115bec6e4912': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.