| commit | 52eef9c59303a731cd1767df54bd9d2183f51cb0 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Sat Jun 27 06:59:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 27 06:59:08 2015 +0000 |
| tree | b85d23f56d0b8c92141134ec579ab7a2833b46d6 | |
| parent | 7db6f54c86579b753c3de46dc45237415f16a3d6 [diff] | |
| parent | f6fd0d1ef24c6ce4b02df09276a17614e930c25a [diff] |
am f6fd0d1e: am 4d78f80d: am 735dff74: am c64048a2: am 904df6db: Merge commit \'8919b945\' into manualmerge * commit 'f6fd0d1ef24c6ce4b02df09276a17614e930c25a': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.