| commit | c4730632cdfae1c1261111ee9f7e9c519da5e235 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Apr 24 13:57:21 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 24 13:57:21 2012 -0700 |
| tree | 7578b218a369b975c369862a2db727699bd2c5dc | |
| parent | b405f58158875e56bf5ee79514ca64dfc17174ea [diff] | |
| parent | c1855ef3221fbc6c5b4543aeb826adc9fe83bae7 [diff] |
am c1855ef3: am fe90e4b1: am ff329d74: Merge "Rename the activity lifecycle sample\'s directory" into ics-mr1 * commit 'c1855ef3221fbc6c5b4543aeb826adc9fe83bae7':