OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 11 Jun 2012 16:22:35 +0000 (09:22 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 11 Jun 2012 16:22:35 +0000 (09:22 -0700)
Change-Id: Iac1c88f2833e67e52af2bc22a17fa93d30cb44cc


Trivial merge