OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Oct 2012 14:28:18 +0000 (07:28 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Oct 2012 14:28:18 +0000 (07:28 -0700)
Change-Id: Ied76c774dce525f9e1ed5c59be92c7cd5bbd9059


Trivial merge