| commit | c64048a299d3df87be9a81ee24c48e6fa74184d3 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Sat Jun 27 05:58:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 27 05:58:47 2015 +0000 |
| tree | beb9c1c168d7d67c3f49eef40d5eb9637f759e09 | |
| parent | f81c71d6dcb279fea123a034d046dd30f44e57ba [diff] | |
| parent | 904df6dbf4f3c917d9ed3620ffbb8e7e0a108bdb [diff] |
am 904df6db: Merge commit \'8919b945\' into manualmerge * commit '904df6dbf4f3c917d9ed3620ffbb8e7e0a108bdb': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.