OSDN Git Service

Reconcile with jb-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 27 Jul 2012 22:44:32 +0000 (15:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 27 Jul 2012 22:44:32 +0000 (15:44 -0700)
Change-Id: I9132cf02a61b153013bd0c7e8d2a5e9dd3161ca4


Trivial merge