Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I0310c299ff4719e454488eafcebbd16045c7e9ea
This commit is contained in:
The Android Open Source Project 2011-01-30 12:40:53 -08:00
commit 30497e4fa6

Diff content is not available