| commit | 17a1863a8e9d3986ea9a82d8297eb359233ddb77 | [log] [tgz] |
|---|---|---|
| author | Patrick Tjin <pattjin@google.com> | Mon Nov 16 16:54:20 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 16 16:54:20 2015 +0000 |
| tree | cf4ca3f2c9c93e63ea5a40f0bcc8d0919002d19d | |
| parent | fe6310e641c6a267c0c722c39d27ac453272a920 [diff] | |
| parent | bd1047ae0a0cc5ce83b7cf365e22a629c5eaf0eb [diff] |
resolve merge conflicts of fcc559f10a to lmp-mr1-app-dev. [DO NOT MERGE] am: c47f606223 am: 4486d32e7d -s ours am: bd1047ae0a * commit 'bd1047ae0a0cc5ce83b7cf365e22a629c5eaf0eb': shamu: update prebuilt kernel [DO NOT MERGE]