OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 16:49:43 +0000 (08:49 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 16:49:43 +0000 (08:49 -0800)
Change-Id: Ie4f29093944bea7faa6eb3b3afaf098336c761ba


Trivial merge