| commit | 04edc95a328d509b8a51123f891d396256bc409c | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jul 06 12:27:36 2009 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Jul 06 12:27:36 2009 -0700 |
| tree | f4ee9a7b40108cb9d50f162e4a7b124bef7d8bc8 | |
| parent | 9945bac30311cc5f7732a9c285dec32d497c47ca [diff] | |
| parent | 6c8cafac168e2cc2425a944717082ebe68795df7 [diff] |
Merge branch 'master' of git://android.git.kernel.org/platform/build into merge_korg_master Conflicts: core/apicheck_msg_current.txt