OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 12:57:51 +0000 (05:57 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 12:57:51 +0000 (05:57 -0700)
commit62bb3720dc21d015b634ac879b44e4c425330375
tree79cbbbd745c7ea5a5ef44d8a7a07e34f95d43549
parent1bcdf7dac72ad060266997047102a051d28184a0
parent2539fd7f95568bdd97034c9099ab3020f4e96c43
Reconcile with jb-mr1-release - do not merge

Change-Id: Ib71f045b334b0f3548a6fda74f7e2ce2253d4bda