OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 30 Nov 2011 20:55:39 +0000 (12:55 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 30 Nov 2011 20:55:39 +0000 (12:55 -0800)
commit2c0dd961d42ad75529a557240ed570f97b237d2f
tree0c7af0196b7825ef755512254220874186af4d1b
parentcd9e929c8490d1410e6d99c9b54585cb2fea569c
parent2907dac07c264b45d43b44d304fbe1865bd8c41f
Reconcile with ics-mr1-release

Change-Id: I00b8d5eecea650df527aa3c21bb4a7270a196401