OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 26 Mar 2012 16:47:10 +0000 (09:47 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 26 Mar 2012 16:47:10 +0000 (09:47 -0700)
commit6e271c76b6906da529804c3672115a9a88fd8e30
treec4a7ea4a1ae15d4c0d69381ad6c3d90459f34c87
parent5d9aedef3067d458e356a6c13a26ad71041ff04b
parent0db00f2ebf23cb58abcbeed6b577a32d100169fc
Reconcile with ics-mr1-release

Change-Id: I9be3678a1dc959923c5eb572e2b6f8243c446157