| commit | bcf9223b3bbe542d0ab040398c26cf1c600f5493 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Tue Jun 30 18:21:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 18:21:50 2015 +0000 |
| tree | a705fff01b29bbcc6a42c1191de475eb0c976ab6 | |
| parent | 4bd25634f13876e7ab31b6de66ceb9ca1cdc784d [diff] | |
| parent | 23444e76d2480d2537c2b6418f0c6c89c8cdb590 [diff] |
am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. * commit '23444e76d2480d2537c2b6418f0c6c89c8cdb590': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.