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)
commitb6bf4cc62db7835fcdaa6243d5bf975a18a4fcd1
treec33b192e00e226495066be24aa9df36212378d72
parent9d7b4c074205609271f61e1a4741ac0c524a1795
parentbd98366df5cac3b7ea5b3cecde5fcb4d2731a145
Reconcile with ics-mr1-release

Change-Id: I10d78e60e39606f85cfa6fc7e9a7da14db0eeb0a