OSDN Git Service

Merge "DO NOT MERGE" into eclair
authorGrace Kloba <klobag@google.com>
Mon, 18 Jan 2010 23:21:31 +0000 (15:21 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 18 Jan 2010 23:21:31 +0000 (15:21 -0800)
commitf080a5adf6d59bade46815ee605a3829e5c3ab89
tree2df114a4e9cf2094ae4538b5846cf4d81dd8b0e4
parent813d2d86789d1c2e705c4d11d052ad649e6bac84
parent19c9df3c1d882b21d6c5fe77f363cda5bf4c7d21
Merge "DO NOT MERGE" into eclair