OSDN Git Service

Reconcile with gingerbread-release gingerbread-mr4-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Aug 2011 01:46:02 +0000 (18:46 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Aug 2011 01:46:02 +0000 (18:46 -0700)
Change-Id: I4ef90a9d38940c8484c030056157a99a103f6aa9


Trivial merge