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


Trivial merge