commit | 83b65486beffc7c86f24c428fbb7b50bbbe189f9 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Tue Mar 17 17:15:47 2009 -0700 |
committer | Jean-Baptiste Queru <jbq@google.com> | Wed Mar 18 09:29:29 2009 -0700 |
tree | ab343e30dd96348d35b0957453fbf6b7b0bac56d | |
parent | 4a4c9f6f98055918f1ebff06b3cc1ed622c058fe [diff] | |
parent | e037fd7e193ecccbb5c0888e49f6d58c224bc11d [diff] |
Merge commit 'remotes/korg/cupcake' into merge Conflicts: init/devices.c libpixelflinger/Android.mk