OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:02:59 +0000 (10:02 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:02:59 +0000 (10:02 -0800)
commit36e70f6e0895b9666cfab196fccf0d26dc25b75b
tree38093f70566c4d76a1a6ea21f20b6738e825433c
parent5ab398eaa77cf7e486f9ecb71b87fb7785a14e57
parent203290beb19aac56a2bfadcca876f853a2e80023
Reconcile with ics-mr1-release

Change-Id: I3b1152bc0e20e7097af445995283581c655e3f2b