| commit | 6313b433edd0b00354ce9f9b40bbb6fd96352efd | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jan 27 09:26:44 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 27 09:26:44 2011 -0800 |
| tree | c1a914d305192fb2e4b0a96a2af49c176574afcd | |
| parent | ab17f6c1e69212e609f9d180361245d8c37108ff [diff] | |
| parent | 020e2fc14a28d6fd449fa37cf8bcbd4b0675238a [diff] |
am 020e2fc1: (-s ours) am 928a0304: re-merge from readonly-korg-master - do not merge * commit '020e2fc14a28d6fd449fa37cf8bcbd4b0675238a': re-merge from readonly-korg-master - do not merge