diff options
| author | Patrick Tjin <pattjin@google.com> | 2015-11-16 17:02:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-16 17:02:36 +0000 |
| commit | ae9ed76ba97b2e3e04e79d2f39f01bfef37476b7 (patch) | |
| tree | cf4ca3f2c9c93e63ea5a40f0bcc8d0919002d19d | |
| parent | 9380b30d7f223be84af34a73ea9e1d4bb55814ff (diff) | |
| parent | 17a1863a8e9d3986ea9a82d8297eb359233ddb77 (diff) | |
| download | shamu-kernel-ae9ed76ba97b2e3e04e79d2f39f01bfef37476b7.tar.gz | |
resolve merge conflicts of fcc559f10a to lmp-mr1-app-dev. [DO NOT MERGE] am: c47f606223 am: 4486d32e7d -s ours am: bd1047ae0a
am: 17a1863a8e
* commit '17a1863a8e9d3986ea9a82d8297eb359233ddb77':
shamu: update prebuilt kernel [DO NOT MERGE]
0 files changed, 0 insertions, 0 deletions