OSDN Git Service

Merge commit 'remotes/korg/cupcake' into merge
authorJean-Baptiste Queru <jbq@google.com>
Tue, 17 Mar 2009 23:30:41 +0000 (16:30 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 17 Mar 2009 23:30:41 +0000 (16:30 -0700)
commitfe0bd690095978fd817ae0ee90e23edb43841cc4
tree9d8c1a8b2f4d3c2808154ab634c9a458b422bc33
parente97d33d5ee914244d6c69789f4f7bbe3ebac1102
parent8232b50d981ce9c584fc1a4af82dae5e70e6ce52
Merge commit 'remotes/korg/cupcake' into merge

Conflicts:
include/hardware/overlay.h