OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Aug 2012 20:12:17 +0000 (13:12 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Aug 2012 20:12:17 +0000 (13:12 -0700)
commitac77bcc7dd61a73297fec25d5b8d8a18154e39c5
treef52f2a5794bd51fdccb3c048f0515c2cce901007
parent4756768db7866b9046dd0b7cc23f82273fbd4a7b
parent44158eaedb9e05a0ad09e3bcdc69ba0306c6566b
Reconcile with jb-mr1-release - do not merge

Change-Id: I623977c46ebcdd6843dfe146e67acc1bc306982b