| commit | 1fd15e3cfd973e24b51f1ea9e3049e419e3a8ef8 | [log] [tgz] |
|---|---|---|
| author | Ed Tam <etam@google.com> | Thu Nov 12 23:23:11 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Nov 12 23:23:11 2015 +0000 |
| tree | ab8cbcc917d27a14835423e3eec45ef35fe723b9 | |
| parent | 0cdb9c18fe386d2426407e884aea90e6747d9e40 [diff] | |
| parent | ba85a48271c8a5fd6d43653dffe153a40a100125 [diff] |
resolve merge conflicts of c45b2cc525 to lmp-mr1-app-dev. am: 610cf316a8 am: 542b135203 -s ours am: a40e99046b am: 6eb7c74188 am: ba85a48271 * commit 'ba85a48271c8a5fd6d43653dffe153a40a100125': flo: update prebuilt kernel [DO NOT MERGE]