tree 91fc46a5906357909697c5d8d2e1bcd3c064fb0c
parent b8f4a84ab9b4a2241b1ac7f2e3209131a73a108e
parent d59f1dea1746b316e556df5b4d2080f110aabd1c
author Scott Main <smain@google.com> 1279243036 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279243036 -0700

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

Merge commit 'd59f1dea1746b316e556df5b4d2080f110aabd1c' into gingerbread

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