OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 2 Aug 2012 18:26:38 +0000 (11:26 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 2 Aug 2012 18:26:38 +0000 (11:26 -0700)
commit6c19776e9c8736b2f29f92e772469724cf55c1e4
tree3ae9b24b05f4b898ac84764229a83decd9b03c82
parentb4c3a393f092fb7cf12046a7024a7feed983b9f1
parenta8545d555ec232a27de30ef452c40daef9f0bba2
Reconcile with jb-mr1-release - do not merge

Change-Id: Ied7fb684e20303e807cb5f06d7cdcdf8e2e16276