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

Merge commit '7ccdfbee63ee482f294becbc5b5e5e1807fbda43'

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