OSDN Git Service

Reconcile with jb-mr1-factory-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:40:50 +0000 (07:40 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:40:50 +0000 (07:40 -0700)
Change-Id: I5edb3257bf8f06c3274051af0c4da369d8643ca0


Trivial merge