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