| commit | de814f3b27cce2521d0c230fc23d5d43bc0f03d2 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Tue Apr 03 15:46:31 2012 -0700 |
| committer | The Android Automerger <android-build@android.com> | Tue Apr 03 15:46:31 2012 -0700 |
| tree | 4b21fd952e1e28538421715ec728da3b9811fd1d | |
| parent | 4d61699f9db89b09d66669403118373249f8ee40 [diff] | |
| parent | a8c2f0d0a64ca86eee827bd888b02e88aa5b1585 [diff] |
Merge commit 'a8c2f0d' into jb-release Conflicts: kernel