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