| commit | cf57515f7070539d560640247df6941a360fcff9 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Sep 12 16:11:21 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 12 16:11:21 2012 -0700 |
| tree | a45eaf32f0a057f7e4b3fb7db2333d9c84491b0c | |
| parent | 7f59867170653a62fb1fbce91bca5f4673be065d [diff] | |
| parent | f801cf55bebc8d0d397fbe6db8cc91b3afb78149 [diff] |
am f801cf55: resolved conflicts for merge of 47bda0c2 to jb-mr1-dev * commit 'f801cf55bebc8d0d397fbe6db8cc91b3afb78149': Update the kernel headers to match external/kernel-headers.