OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Oct 2012 14:32:31 +0000 (07:32 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Oct 2012 14:32:31 +0000 (07:32 -0700)
Change-Id: Ia0c83f8eaad8974240651bfa206f0212eb72983d


Trivial merge