OSDN Git Service

Reconcile with ics-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Sep 2011 13:19:32 +0000 (06:19 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Sep 2011 13:19:32 +0000 (06:19 -0700)
Change-Id: I445a06a1c4486a76a9278c2ab57415cd902f8927


Trivial merge