OSDN Git Service

Merge branch 'cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:39 +0000 (14:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:39 +0000 (14:05 -0800)
commit9a0eba855ff112fc873c5c4198775cdcd4e092d3
treeab9148c9e1d1275adc85d2e68442d998f2745a23
parenta1146f9a6f3c87d22e73581ff8bc762dfa8e892a
parent2ecd0f64520caf3f309b2ecfb05fbe4a8cea0d5c
Merge branch 'cupcake'