OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 Oct 2011 17:52:11 +0000 (10:52 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 Oct 2011 17:52:11 +0000 (10:52 -0700)
commitbbda267de483446a3d458b35d9b2effaf1fa35f4
tree1d215f246837fcccd456862807ceeb60646e9da5
parent32fa8a313cf7b94396761dd09addb2d80848b336
parent5fb68024fc31d622b02d11107cc256e1f3dc216c
Reconcile with ics-mr0-release

Change-Id: Iddfb8ec409ada196db97434c2f85de1c6954cd1a