OSDN Git Service

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


Trivial merge