OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 22:02:29 +0000 (15:02 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 22:02:29 +0000 (15:02 -0700)
Change-Id: I2c181ef0dd06df0086bd941ccf69b5c6aca437d0


Trivial merge