bfbf84b726
Merge commit '2b136832be7326caed0c79bae418c2dd54372bea' into gingerbread-plus-aosp * commit '2b136832be7326caed0c79bae418c2dd54372bea': fix code snippet error