OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Jun 2012 15:14:15 +0000 (08:14 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Jun 2012 15:14:15 +0000 (08:14 -0700)
Change-Id: Idef831103e3ee313ae771483241391f90f5feafb


Trivial merge