OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 22:03:55 +0000 (15:03 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 22:03:55 +0000 (15:03 -0700)
commit4756768db7866b9046dd0b7cc23f82273fbd4a7b
treef52f2a5794bd51fdccb3c048f0515c2cce901007
parent80d807c37135a73e6c92aef3751a6436eb9e3c73
parentd4dfe1395e6e83c3fb815b955c6db2ddae2aa2f4
Reconcile with jb-mr1-release - do not merge

Change-Id: I71f44d5cbc8d472de454bcee33de8cc5879776de