OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 15 Dec 2011 00:05:32 +0000 (16:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 15 Dec 2011 00:05:32 +0000 (16:05 -0800)
Change-Id: I1b745b11729a3fda14ffe44f1f44854e087318c7


Trivial merge