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