OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Oct 2012 14:32:31 +0000 (07:32 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Oct 2012 14:32:31 +0000 (07:32 -0700)
commite666ccd6ab00d689819b537e51ab9b965f8a433a
tree43610f1c7b55d3087eef3615f110d0ae616439c2
parent796367ef31a7a1409f7ce5756f8142100d31053a
parentf5ccdc6d74c9445e8e81e16e14004bb3d6349a08
Reconcile with jb-mr1-release - do not merge

Change-Id: Ia0c83f8eaad8974240651bfa206f0212eb72983d