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


Trivial merge