resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe
This commit is contained in:
Xavier Ducrohet 2011-07-20 16:31:25 -07:00
commit 7ffa22b984

Diff Content Not Available