OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Aug 2012 15:29:20 +0000 (08:29 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Aug 2012 15:29:20 +0000 (08:29 -0700)
commitcf14086910b325be9a76c1df0dfc25dca30c98d5
tree888d5dd585ed1cea3a152834bc86c7524fc3d01d
parent2b15f2844d0160aa3ab3407ce667d77a0db80ab4
parent6ce024cb7599cb0f6f1d80598c46fb1bae860363
Reconcile with jb-mr1-release - do not merge

Change-Id: I024b531fa1a5981a894bbd56f91e263b15928a1b