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:28:39 +0000 (08:28 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Aug 2012 15:28:39 +0000 (08:28 -0700)
commit7e266298b93bf60b193007d2e5238daef1eaaf8c
treeb9d7763f797dd0ae0abe83fce171a57c402cad85
parent011919f2d29aa41fb6638052533bf1d51a2adc0f
parent5532aa6efdb6358c5543eea5786b86969a2fee2c
Reconcile with jb-mr1-release - do not merge

Change-Id: I8c04d0993640dd9ad32dc8a383266b28ab0c5494