am d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity...
am d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo
Merge commit 'd59f1dea' into gingerbread
* commit 'd59f1dea':
docs: update notepad tutorial to change EditNote activity title and update codelab zip