OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Apr 2012 21:40:27 +0000 (14:40 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Apr 2012 21:40:27 +0000 (14:40 -0700)
commit49826d43d1911939ccb1ac1ee9755ba5057065f6
treefe67df7c1a2141cdf9d343277d2a8853a2901e8e
parentda7c5fab68cb65d0535d230b9487bfaa5d6ded56
parentfd695590504c1eb612b4002952ec1e23ee63d91c
Reconcile with ics-mr1-release

Change-Id: If202c8b713a5d273115764c404cbe45a88c8d658