| commit | a40e99046b1746c72c4ca897ecb46a31b78c40cc | [log] [tgz] |
|---|---|---|
| author | Ed Tam <etam@google.com> | Thu Nov 12 23:08:02 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Nov 12 23:08:02 2015 +0000 |
| tree | bbe683d5a1eeb1fcc7cfa0dccf91b4afe3ada0e4 | |
| parent | 3e7c916c8015dc18bff691e8508b2b09895e6c41 [diff] | |
| parent | 542b1352034cdd269395dd004a8e04a7f9cefb11 [diff] |
resolve merge conflicts of c45b2cc525 to lmp-mr1-app-dev. am: 610cf316a8 am: 542b135203 -s ours * commit '542b1352034cdd269395dd004a8e04a7f9cefb11': flo: update prebuilt kernel [DO NOT MERGE]