OSDN Git Service

Merge "DO NOT MERGE" into eclair-mr2
authorGrace Kloba <klobag@google.com>
Thu, 21 Jan 2010 02:59:05 +0000 (18:59 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 21 Jan 2010 02:59:05 +0000 (18:59 -0800)
commit0a3f01ac5e5855c3563694671091d4c1ce89cac5
treea1d95d8615b64e0d3f9a98c6eed1e20a24f27f0e
parent72acb46d81f6f3c7015109c925762dcc7fa12802
parent95adf8ecdcbda52f8c5edd0718c7747f0c4d7667
Merge "DO NOT MERGE" into eclair-mr2