diff options
| author | Patrick Tjin <pattjin@google.com> | 2015-11-16 16:51:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-16 16:51:19 +0000 |
| commit | bd1047ae0a0cc5ce83b7cf365e22a629c5eaf0eb (patch) | |
| tree | 839439d79aed64a5c8e7950eb104b1ed69e6bad6 | |
| parent | 5bd990d698d61b90c793e8ca0bded5cc2c301752 (diff) | |
| parent | 4486d32e7d3ef9283431560070d65a19b48aa968 (diff) | |
| download | shamu-kernel-bd1047ae0a0cc5ce83b7cf365e22a629c5eaf0eb.tar.gz | |
resolve merge conflicts of fcc559f10a to lmp-mr1-app-dev. [DO NOT MERGE] am: c47f606223
am: 4486d32e7d -s ours
* commit '4486d32e7d3ef9283431560070d65a19b48aa968':
shamu: update prebuilt kernel [DO NOT MERGE]
0 files changed, 0 insertions, 0 deletions