OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Feb 2012 18:18:29 +0000 (10:18 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Feb 2012 18:18:29 +0000 (10:18 -0800)
Change-Id: Ib912870641c7efedd4c01066f0e86dd3f85aaa2d


Trivial merge