OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 28 Oct 2011 22:59:38 +0000 (15:59 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 28 Oct 2011 22:59:38 +0000 (15:59 -0700)
commit5d8f09e5b36ba3ecee88cecb701ec526f0ac5398
treeb7a76062aa4ef79f679e6a510a19e311ea2cc8a1
parent0393a5366e080dad0fec2e431a20ee34518f7bb5
parentac17e30d99fd4420ab1563384046beb33b2af52f
Reconcile with ics-mr0-release

Change-Id: I8e45b4aba1157aec4a3d12cf9cd2b77610b677e9