OSDN Git Service

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


Trivial merge