OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Feb 2012 23:34:42 +0000 (15:34 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Feb 2012 23:34:42 +0000 (15:34 -0800)
commit065506ec25b39b1abdcefb483992d71be70defb6
tree0bcddc27dc121b05cee2f35847afcd8f8361289f
parenta2ca4f14f43636b00aba274718854e9ed851959d
parentc7887ba1981d6b736c512fdb6ef189a5ff1dd504
Reconcile with ics-mr1-release

Change-Id: Ib089acee59a2ac7913b5d35185f165f777800626