tree ac5d7ba5f390b9bd6ce16276ea9576050b642d82
parent c9659424cfa971f202f1bee44f7acb6873b0954b
parent 4cb8293bb3e611777cdc6c0a09410839c9dc161f
author Scott Main <smain@google.com> 1279243167 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279243167 -0700

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