tree 9945f69bed1230365427196de1cd030417982738
parent 4555973dd40a64dd5c52dd6b99b1b4a366cc638f
parent d3263a75d5b2bc856c97500c45284af2d8ac13d3
author Scott Main <smain@google.com> 1334879575 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1334879575 -0700

am d3263a75: am ff329d74: Merge "Rename the activity lifecycle sample\'s directory" into ics-mr1

* commit 'd3263a75d5b2bc856c97500c45284af2d8ac13d3':
  Rename the activity lifecycle sample's directory