d555e2643f
Merge commit '354954a01c533c6789536c141cf330ddf3976e8b' into gingerbread-plus-aosp * commit '354954a01c533c6789536c141cf330ddf3976e8b': Doc change: cherrypick testing changes from master. Squashed commit of the following: