OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:18:37 +0000 (09:18 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:18:37 +0000 (09:18 -0700)
Change-Id: I40ce39e6f067e352b19562897b2baf2bab3b6a39


Trivial merge