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


Trivial merge