am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
Merge commit 'b3a5b85a' into gingerbread-plus-aosp
* commit 'b3a5b85a':
docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38