| commit | 385457dc31a1e182b75218cb1ad4f82b866efafd | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Jul 16 19:19:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 16 19:19:20 2015 +0000 |
| tree | 83d17c5ee26b3d21ea86f4eb48654d4dd7bfec3b | |
| parent | c2231e70e38af3c85daafbcb24d7954bd3cbef78 [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