OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 23:49:35 +0000 (15:49 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 23:49:35 +0000 (15:49 -0800)
commit1ca1730b88e45d39c9211793d133cae148b134a1
treec93dd28f3ffa0a325e6641c18e229382854b0ddc
parent409670e9fa4131bed57a292b3a25180e4ac0709e
parent4c38d0cc8f4b002c5dcb9fe6dd000c0e9ac40397
Reconcile with ics-mr0-release

Change-Id: I134c060024841405d83b92a700bfe05aeb5d86b5