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


Trivial merge