OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 23:43:26 +0000 (15:43 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 23:43:26 +0000 (15:43 -0800)
Change-Id: I90ea8a02a4bb9b357d7bddfa1a02602d3de839fa


Trivial merge