| commit | 17ca1f5d26aebd25fa89e86082d2fe423174aeae | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Jul 16 19:19:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 16 19:19:56 2015 +0000 |
| tree | 0386f3243883b05cddf4aa8c3d97aeac64fbdd31 | |
| parent | 464827d1e8f5b51df3e6b579f9d83e11c836effb [diff] | |
| parent | 4a5f5a7b15e27ed159e2398c77de1de7f9fd4da9 [diff] |
am 4a5f5a7b: am a972891f: Merge "file_contexts: Label /dev/ttyS2 as console_device" * commit '4a5f5a7b15e27ed159e2398c77de1de7f9fd4da9': file_contexts: Label /dev/ttyS2 as console_device