OSDN Git Service

Merge "DO NOT MERGE" into eclair-mr2
authorGrace Kloba <klobag@google.com>
Tue, 2 Mar 2010 00:02:12 +0000 (16:02 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 2 Mar 2010 00:02:12 +0000 (16:02 -0800)
commit3ff7cecd3d9a1bb9485e32b0e6920f24022a5565
tree9352d2024edf3f0cc09102ea2e20d94dd03a2282
parentcfb50c66faf4ff8a6f76884fdaf2dcb48d4d63a3
parentef962fc34cbd05e524f190086f17527d1bc3bf0f
Merge "DO NOT MERGE" into eclair-mr2