OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 15:43:18 +0000 (07:43 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 15:43:18 +0000 (07:43 -0800)
commit03345d0caa2c5fa7314ffc41030646ed0712ae0a
treee59e1814662a911315e045fe48f0e7b42eaf72c4
parent85975f726ef2bb7ad27ba343fe2a87c02226b588
parent9b2646b723af2dbca2faa2cfda8f6911e95b7895
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I735c4ab87f233912c203cac0f008ec115b9b1103