OSDN Git Service

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


Trivial merge