OSDN Git Service

Reconcile with ics-mr0-release ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:21:43 +0000 (10:21 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:21:43 +0000 (10:21 -0800)
commitddbd1fd2bd09e7252464b3b2b4e9d2f37bcc155e
tree0784d17d80f88a0c09f9a2c4f6ecc4047af63cef
parent20cbf307bdd9b68819468e28d2f651db25ced970
parent5ac81863de3dba0c42b7eb07c45d7e4fd071c597
parentb6033fa64c527045df9792aee0a7db787c9688b5
Reconcile with ics-mr0-release ics-mr1-release

Change-Id: Ia4cdb4ae14cd906ff06b5e92ef3baeb7394e654c