| commit | 4158b09dc232f5e1d882aa037aed8159c11d531d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Dec 19 08:06:12 2008 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Dec 19 08:06:12 2008 -0800 |
| tree | 57cf7487c9e5e66c3c2d8b4e0cebe30e1662a02c | |
| parent | 5ecbb8067789854f471cd73ce4650ac91a2e1b3e [diff] | |
| parent | 51704bed795b5b0e5e3c7b792dcdc2bf2d96a9e9 [diff] |
Merge commit 'remotes/korg/cupcake' Conflicts: include/hardware/AudioHardwareBase.h