OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 20 Jun 2012 15:25:33 +0000 (08:25 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 20 Jun 2012 15:25:33 +0000 (08:25 -0700)
Change-Id: I71f037e68eda652f71ce7a15e4afff031adbd913


Trivial merge