| commit | 46c264c27522861d399bb66120fc5903e8e00a98 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Fri Jun 26 23:54:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 26 23:54:20 2015 +0000 |
| tree | 8e201466bfc4b176f3d76e92b6ecf97d5a00c04a | |
| parent | ab321e2cde77d5e38a6f341d47d9774e3f3a578e [diff] | |
| parent | 42bd1931661a3abf7b0a5f2ff1643837e9482a0b [diff] |
am 42bd1931: (-s ours) am 00d04115: 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 '42bd1931661a3abf7b0a5f2ff1643837e9482a0b': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.