OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Oct 2011 14:04:51 +0000 (07:04 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Oct 2011 14:04:51 +0000 (07:04 -0700)
commit78bb9e60cbd0203525dcdc4d4c68776e456428d7
tree6af1e11c0fdf6c5b8c78257eced55a774e193e66
parentb83613774f19ae2c2aa21e741069b030d869eff1
parenteba718fbe62e0733ff886b46018c1b5b715953b3
Reconcile with ics-mr0-release

Change-Id: I326384d8f33fbf4aceaf34331983727fd6bf256f