resolved conflicts for merge of 988d3d71 to honeycomb-plus-aosp
Vladimir Chtchetkine authored
Change-Id: I85178afbca0b8b51eb3890958b063a70a1b33b96
d8ad6c98