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 20:18:23 +0000 (12:18 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:18:23 +0000 (12:18 -0800)
Change-Id: Ic5ee78e018bd5706185edd8b01de3cb6bf121ed4


Trivial merge