OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Jun 2013 14:23:39 +0000 (07:23 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Jun 2013 14:23:39 +0000 (07:23 -0700)
Change-Id: Ie1d9fd280ad0b593e75ce17c11e45d34cf6df4ab


Trivial merge