tree 4ca64e6705104fcfb33576e9aa815f1a29a55c17
parent 98e7c5111546731f7f5374f3663b025da3d68a8c
parent df6da5671fa151c3ef8eb52bbf3d5984b6099b8c
author Joe Malin <jmalin@google.com> 1288048966 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288048966 -0700

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

Merge commit '5016df1cface59b04ad59d0fef29ea32dcad8d60' into gingerbread-plus-aosp

* commit '5016df1cface59b04ad59d0fef29ea32dcad8d60':
  Doc Change: Revert NotePad sample test package