commit | 15a228a4e4e4a602aa2f2724f3e616b8aba6172b | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:39:02 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 06 10:39:02 2013 -0700 |
tree | b6342fc62489aa85e87702638b7b16f3494a31a7 | |
parent | 7a130c0f9ca975fd63c27eae0ccd1eb7ac944b6f [diff] | |
parent | 1ca7356c5be39e9fa55eed4ac6115237ed0d73a9 [diff] |
am 1ca7356c: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit '1ca7356c5be39e9fa55eed4ac6115237ed0d73a9': grouper: update prebuilt kernel