| commit | d92b69fcfdd3d702aa3de382de1ff7e4cb25c5cb | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Fri Jun 26 23:54:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 26 23:54:29 2015 +0000 |
| tree | 20fd5f95c5d28cc16fb7e0892ac97894129fcc48 | |
| parent | 8c66e5ec95e8779ff34a98ee36a2c19659acdb4e [diff] | |
| parent | 3bcd1e1443dd0e86a249987d6787fa1df8b2eb7f [diff] |
am 3bcd1e14: (-s ours) am 7db6f54c: am c3f64efd: am 6d2e7c0f: (-s ours) am aa902abe: am f81c71d6: am 20499eea: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. * commit '3bcd1e1443dd0e86a249987d6787fa1df8b2eb7f': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.