7d5c0e660e
Merge commit '15f0a79a81fd18211603587bcd46eee0e37ced4d' into gingerbread-plus-aosp * commit '15f0a79a81fd18211603587bcd46eee0e37ced4d': fix typo in comment @beamsOverlap