OSDN Git Service

Merge "DO NOT MERGE" into eclair
authorGrace Kloba <klobag@google.com>
Thu, 21 Jan 2010 07:30:05 +0000 (23:30 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 21 Jan 2010 07:30:05 +0000 (23:30 -0800)
commitf6aed0e0a7c96094b66f5426baad78032b794497
tree0136acdc3a0be3187ae8fddaa4c62cddf2f5322e
parentd5ada83c719d366d3063572ca6ce5ab8918fd39b
parent52cb3cbd6fe06e3706be1a7c2939f027106aaaf7
Merge "DO NOT MERGE" into eclair