Merge commit '5016df1cface59b04ad59d0fef29ea32dcad8d60' into gingerbread-plus-aosp * commit '5016df1cface59b04ad59d0fef29ea32dcad8d60': Doc Change: Revert NotePad sample test package
Merge commit '5016df1cface59b04ad59d0fef29ea32dcad8d60' into gingerbread-plus-aosp * commit '5016df1cface59b04ad59d0fef29ea32dcad8d60': Doc Change: Revert NotePad sample test package