OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 18 Oct 2011 14:31:50 +0000 (07:31 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 18 Oct 2011 14:31:50 +0000 (07:31 -0700)
commitb5bd0a1bc613fe018e37d9f96e94ad3044ea1815
tree281838ed0d4722df6a20a51a11e1e89c53db3119
parent67d6305c5c814e3a913a4cd69aafdc2f1410b22d
parenteab7f20d1eec2f2fcd02f05197b2d05918063226
Reconcile with ics-mr0-release

Change-Id: I595da4205a7c60207644b445af0491a9aef5a9d3