am 4cb8293b: am d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo

Merge commit '4cb8293bb3e611777cdc6c0a09410839c9dc161f' into gingerbread-plus-aosp

* commit '4cb8293bb3e611777cdc6c0a09410839c9dc161f':
  docs: update notepad tutorial to change EditNote activity title and update codelab zip