diff options
| author | Ed Tam <etam@google.com> | 2014-07-28 19:39:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-07-28 19:39:01 +0000 |
| commit | f536f7ac9b765b802fc7086eed1d2ca809971372 (patch) | |
| tree | 892a3ea3b8d52377557e6235a44ad8efa383a9b4 | |
| parent | ede3437dde7c16466c757d4a9b4ebdffd07b4fd6 (diff) | |
| parent | ea8145cfe34f91829e6b8891ab72e3031762365d (diff) | |
| download | flo-kernel-f536f7ac9b765b802fc7086eed1d2ca809971372.tar.gz | |
resolved conflicts for merge of 6d741239 to klp-modular-dev automerge: df8028e
automerge: ea8145c -s ours
* commit 'ea8145cfe34f91829e6b8891ab72e3031762365d':
flo: update prebuilt kernel - DO NOT MERGE
0 files changed, 0 insertions, 0 deletions