am 96bdc500: am 5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread

Merge commit '96bdc500104c3e162495a9bfcf90799467e45c3d'

* commit '96bdc500104c3e162495a9bfcf90799467e45c3d':
  Doc Change: Revert NotePad sample test package