OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Mar 2012 18:11:47 +0000 (10:11 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Mar 2012 18:11:48 +0000 (10:11 -0800)
commit9407583c705c25419bafb4337fb4ef76e6a79d74
tree09b9b21af72d3ec57979d8cde93c63b72e2db7cc
parentc26ce0c14a4451943dc400732577a0147d16ba51
parentbd026f32e1b9ac63461c093da3c896e821570913
Reconcile with ics-mr1-release

Change-Id: I0dd6896813e61ae5168134d6018dc96bd41008e8