OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 21:12:21 +0000 (13:12 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 21:12:21 +0000 (13:12 -0800)
commit409670e9fa4131bed57a292b3a25180e4ac0709e
treec93dd28f3ffa0a325e6641c18e229382854b0ddc
parent700b18cc72e75737fa5cf79896c98f12003b7735
parent03fa09765443803911af960db3b066babbc75849
Reconcile with ics-mr0-release

Change-Id: I1a7eeaede99ffa7bb7f38ee419704ab9d1f2d834