OSDN Git Service

Reconcile with ics-mr0-release ics-factoryrom-2-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 16 Nov 2011 15:33:52 +0000 (07:33 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 16 Nov 2011 15:33:52 +0000 (07:33 -0800)
Change-Id: I76232373a2c25c0e18c27672ede2bb1b281e43f6


Trivial merge