OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 19 Jun 2012 14:16:03 +0000 (07:16 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 19 Jun 2012 14:16:04 +0000 (07:16 -0700)
Change-Id: I2b3e50f3304a3e5bd0e23e70b30db6e10d546f1c


Trivial merge