OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Feb 2012 23:06:21 +0000 (15:06 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Feb 2012 23:06:21 +0000 (15:06 -0800)
commita2ca4f14f43636b00aba274718854e9ed851959d
tree0bcddc27dc121b05cee2f35847afcd8f8361289f
parentc06eaa4cadd32825a8b3a1bda7bba83ceccb7e00
parent2499fddf2184c8b6fbd019a6b1082e9e78dcd3cd
Reconcile with ics-mr1-release

Change-Id: I3f6da4c538fdb160bed6228d1d57026c7e9c12eb