| commit | 78f1251dc7a6b105bd81090f5620db4b424b4926 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Fri Jun 26 23:26:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 26 23:26:40 2015 +0000 |
| tree | 73901e71a3ddfcf186e51b16c22d160c13f46f57 | |
| parent | a816b780e1601f953ed67fcabf558de40dc5be6c [diff] | |
| parent | bf1b025974546680eb0fe3525b6ef5d0202df983 [diff] |
am 37b4546e: am 1573d8ef: (-s ours) am d98e7c1d: am 7278b043: am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. * commit '37b4546ec052c18f04fe2881e36e3fe38e564780': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.