OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Oct 2011 16:17:01 +0000 (09:17 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Oct 2011 16:17:01 +0000 (09:17 -0700)
commitb4446245dd0f9e8613668c9284aadf11b47f2d30
tree5afeebb42a7b58e93dd83afe236df9819ddedeb9
parent5b95337f534d635fb790c2a88df46d9b0acf54fc
parent1cd4ac8ea186f313d2d43192d9988ece10259c43
Reconcile with ics-mr0-release

Change-Id: Id2ef87f3662a93f2cedbf1dcb7f0f33d9893637e