OSDN Git Service

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


Trivial merge