tree 2aa2cb6936c908494527967d2b865eaf6392b787
parent f8647fc367d10fdf5fde53027c6562d376e081f8
parent f17cb2110c02b062e9736edaa5777494987ba6a2
author The Android Automerger <android-build@android.com> 1304917912 -0700
committer The Android Automerger <android-build@android.com> 1304917912 -0700

Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2