diff options
| author | Ed Tam <etam@google.com> | 2015-11-12 23:12:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-12 23:12:18 +0000 |
| commit | 6eb7c74188e27b5d271b22e4f776cba854c8a06e (patch) | |
| tree | ab8cbcc917d27a14835423e3eec45ef35fe723b9 | |
| parent | 3f7a22e29fd16d35ec7a4b2b15f78d9defc47a34 (diff) | |
| parent | a40e99046b1746c72c4ca897ecb46a31b78c40cc (diff) | |
| download | flo-kernel-6eb7c74188e27b5d271b22e4f776cba854c8a06e.tar.gz | |
resolve merge conflicts of c45b2cc525 to lmp-mr1-app-dev. am: 610cf316a8 am: 542b135203 -s ours
am: a40e99046b
* commit 'a40e99046b1746c72c4ca897ecb46a31b78c40cc':
flo: update prebuilt kernel [DO NOT MERGE]
0 files changed, 0 insertions, 0 deletions