| commit | 33616670237bf07e322bad7469ea8ba7fa0a1e04 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Thu Jul 02 01:09:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 02 01:09:40 2015 +0000 |
| tree | ac14beed859ded703a4825df86e7f3e52a8b5e68 | |
| parent | b8e4136ba6b66c04c168c778c5d982cf3aa3a409 [diff] | |
| parent | 6f8605e31d5e5104507e13bea76d9d87fb7ebf0c [diff] |
am 6f8605e3: am 6ec76899: am 1a1e030c: (-s ours) am 50a02f3c: am e1f4e0bc: am 5b105d54: am 001c1dbe: am 0d69454e: am e2550667: (-s ours) am bff09c93: am f7e6aeea: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. * commit '6f8605e31d5e5104507e13bea76d9d87fb7ebf0c': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.