OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 22:19:21 +0000 (14:19 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 22:19:21 +0000 (14:19 -0800)
commitb7a115c77ad4852aae5ec2ce30ea2b05f3dd1d75
treede6b4b8f0dc396fb02a548f3b5b1fa89ea6a74b2
parent4c1614b7845252209742411acd09723e2245b8f8
parent56a58dea9d77eaeae7d3e21fba1febb82179debf
Reconcile with jb-mr1-release - do not merge

Change-Id: Id8f361c784adbf1b22de8a82b4cbdc2ea3a15bf7