| commit | 542b1352034cdd269395dd004a8e04a7f9cefb11 | [log] [tgz] |
|---|---|---|
| author | Ed Tam <etam@google.com> | Thu Nov 12 21:20:25 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Nov 12 21:20:25 2015 +0000 |
| tree | 7eccb626246e360e75b4ed0bd154eebe235b305e | |
| parent | ec7728182c5bbbd6951263667c43eca40b1780c7 [diff] | |
| parent | 610cf316a8751839359e0b3142c3e4e8e30d1446 [diff] |
resolve merge conflicts of c45b2cc525 to lmp-mr1-app-dev. am: 610cf316a8 * commit '610cf316a8751839359e0b3142c3e4e8e30d1446': flo: update prebuilt kernel [DO NOT MERGE]