OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Mar 2012 15:23:03 +0000 (08:23 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Mar 2012 15:23:03 +0000 (08:23 -0700)
commit35a8f94da6a8a3a6757e5663bfcbcd044f72a92a
treeb0c7db9fcb8d2abbc851c6a2d8720201c93b621d
parentb7a6f5d7e87eb4fba6d6868e73a9c06d73789517
parentdf331873c8576e0ae34ae1ee3cc258beed373535
Reconcile with ics-mr1-release

Change-Id: I10d78e60e39606f85cfa6fc7e9a7da14db0eeb0a