| commit | e3fa97b386e8df83e83e80a9e452f6972a2cde72 | [log] [tgz] |
|---|---|---|
| author | Patrick Tjin <pattjin@google.com> | Fri Oct 31 00:56:55 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 31 00:56:55 2014 +0000 |
| tree | 51f08b85e6e1fbc81ce5d17a57fd6d70d049e4d7 | |
| parent | c6eba0d9b0421ca139cd2ae990f8ae738b5adb9c [diff] | |
| parent | b61569048e5a62a5e774c7f003ca720818dfa818 [diff] |
resolve merge conflicts of f687ab1 to lmp-sprout-dev. automerge: b615690 -s ours * commit 'b61569048e5a62a5e774c7f003ca720818dfa818': shamu: update prebuilt kernel