tree a05927daa315c5338b5424e1916c5a98272f9a13
parent 996d60e3a5abe29479b741bd1b346977e4c101aa
parent abcb4fecfce3285779c9f323a8652398ab75e881
author The Android Open Source Project <initial-contribution@android.com> 1296420039 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1296420039 -0800

Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I7ca5acfee971105e3f3d6a674f82da0e890b0434