OSDN Git Service

Merge branch 'cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 22 Jan 2009 08:15:57 +0000 (00:15 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 22 Jan 2009 08:15:57 +0000 (00:15 -0800)
commitea35a5cf6d5cbef9a40159d5adbd4c5924788993
tree4b825dc642cb6eb9a060e54bf8d69288fbee4904
parentf12832e7415222fb688414c9d7d593fb60b180fd
parentecbf185124dfa3475f4975677f9b834edd9da27b
Merge branch 'cupcake'