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