OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 3 Jul 2012 19:11:41 +0000 (12:11 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 3 Jul 2012 19:11:41 +0000 (12:11 -0700)
commit14c31bdc30d115113575b75abfe01a639a3a6a12
treef4ba9224bfa2c967114667da9a75b7517cb5b1d2
parentd512fda4ae7cc56cc9b83fcb6e7a9e0d0f02c259
parentb04e93207d213fa29d0a086984f12d9375c8190c
Reconcile with jb-release

Change-Id: Iee367557b16d18b63d71c2ea910d207820643c11