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


Trivial merge