OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 30 May 2012 17:16:25 +0000 (10:16 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 30 May 2012 17:16:25 +0000 (10:16 -0700)
Change-Id: Ia54294c438373cc24703fc93bbd95f4b936d668a


Trivial merge