OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 7 Jun 2012 14:51:25 +0000 (07:51 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 7 Jun 2012 14:51:25 +0000 (07:51 -0700)
Change-Id: I617695b74de11b9aec6d4b4355d6859f0ada53e8


Trivial merge