tree 7374cbbaf9b1549e86c8f06399fe64a892e2cf17
parent 1a669bdf66bc93f2af6aafa91d605fb6713f1b9b
parent dfd2ae2278fba8654d9c8f81a16e8fb833c6e4f0
author Scott Main <smain@google.com> 1333582053 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333582053 -0700

am dfd2ae22: Merge "uploading sample code for AU class on Activity Lifecycle" into ics-mr1

* commit 'dfd2ae2278fba8654d9c8f81a16e8fb833c6e4f0':
  uploading sample code for AU class on Activity Lifecycle