| commit | 7c07cf9a82f3ba211883a9ee4a1ce4cf8c286015 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sat Jul 25 16:58:22 2009 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Sat Jul 25 16:58:22 2009 -0700 |
| tree | b817134f0316bc0ba447856a60d3ef86d82869f4 | |
| parent | 6c8cafac168e2cc2425a944717082ebe68795df7 [diff] | |
| parent | 8cebf1ff7836a5dc365e49f7a14d7546a651d9c7 [diff] |
Merge korg/donut into korg/master Conflicts: core/apicheck_msg_current.txt core/combo/linux-arm.mk core/prelink-linux-arm.map tools/droiddoc/src/ClassInfo.java