| commit | fd8892cefb8470afe455f7cd1ac7385a8d35e754 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sun Jul 05 16:48:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 05 16:48:20 2015 +0000 |
| tree | 736f13ca8dbe95aef73f5b3e6988adc9205eebe5 | |
| parent | 1f2d6e12bf94f49ba69cdc14cabffff84fa78ea9 [diff] | |
| parent | 0db7747c94fb88a5553b143fef0b406cde593dd0 [diff] |
am 0db7747c: (-s ours) Merge changes I260c7904,I5ffe2ddf * commit '0db7747c94fb88a5553b143fef0b406cde593dd0': update mips kernel update x86 kernel