tree 2e8a393fe19a343c8aa470ae33f5cc0f64dc44ad
parent 6ce1c4e6f6c96cee1d799d774e803d048d808834
parent ed5ba112bc2229c68916ada8eb0d783ba66df9e1
author The Android Open Source Project <initial-contribution@android.com> 1296420858 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296420858 -0800

am 5f773b9f: Reconcile gingerbread-plus-aosp and honeycomb

* commit '5f773b9f72367ed8046df257d20881fd96f86929':
  resolved conflicts for merge of a314f32b to honeycomb-merge