OSDN Git Service

Reconcile with jb-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 27 Jul 2012 22:44:32 +0000 (15:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 27 Jul 2012 22:44:32 +0000 (15:44 -0700)
commit3166fd6ad9a893f26e4f881328243fdfd8c6c029
treed3d295a7ad853656e66813170d4a5e6e2b90a8c0
parentfb983b57d5a7d920a0f78252180b41fdeff20589
parentc741d502f43f63d9398d1252c00137f452b153fb
Reconcile with jb-mr1-release

Change-Id: I9132cf02a61b153013bd0c7e8d2a5e9dd3161ca4