OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 11 Jun 2012 16:22:36 +0000 (09:22 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 11 Jun 2012 16:22:36 +0000 (09:22 -0700)
commitc5c1df92c25bbbd6fc49c8e86fdfbc7453024427
treea9805e943427f9af96b3611ddff4d2dbfa4cca0e
parent4168c3a339d8a6d571dcbceca65b9936da1c5e55
parente3f43309a68a31f6389b0fda6cad91e4d6ab45c6
Reconcile with jb-release

Change-Id: Ia53e5d26bd13718633bfe4931243ee2d9b1bdb6f