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, 10 Oct 2012 16:44:41 +0000 (09:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Oct 2012 16:44:41 +0000 (09:44 -0700)
Change-Id: I9b2354f718f8e792bd040b7fb92f8fd1c77c037a


Trivial merge