OSDN Git Service

Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 Sep 2012 22:21:12 +0000 (15:21 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 Sep 2012 22:21:12 +0000 (15:21 -0700)
Change-Id: If17cb68d4590892767c5c9669b194c8c8cda68b6


Trivial merge