OSDN Git Service

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

Change-Id: I4c70661759198e26a86a1070746a9b609598a2f2