OSDN Git Service

Reconcile with gingerbread-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 May 2011 19:55:54 +0000 (12:55 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 May 2011 19:55:54 +0000 (12:55 -0700)
Change-Id: I18e105bceb8fcdc98c7dc412e088eb7652737e9f


Trivial merge