OSDN Git Service

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


Trivial merge