| commit | b2d484d680dd4053b301238b81c4cb0efe6f0ceb | [log] [tgz] |
|---|---|---|
| author | Iliyan Malchev <malchev@google.com> | Thu Dec 11 00:06:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 11 00:06:54 2014 +0000 |
| tree | 10ad2f6fd01c34679ff07896e61e174b4f93c3d3 | |
| parent | d2e8822c93cb66e1c97b566dc55ab415a8a7a31a [diff] | |
| parent | 716e6308e963945d300cec8c89338fe939db5216 [diff] |
am 716e6308: resolved conflicts for merge of d3c4ae2a to lmp-mr1-dev * commit '716e6308e963945d300cec8c89338fe939db5216': grouper: update prebuilt kernel