tree e5d4658f89e6c351b282682b9ff022899dfe8cc5
parent 0d9209784aa062a20bf5dda66700c00fc65e4a32
parent dc54a8c742e96d6ea8ef3e18c0f2ee1235899599
author Jeff Hamilton <jham@android.com> 1296268902 -0600
committer Jeff Hamilton <jham@android.com> 1296268902 -0600

resolved conflicts for merge of dc54a8c7 to honeycomb-merge

Change-Id: Ie23b05102fc69de31537822ded3f77d398e486f8