tree 6ffc3fbb6dc7596fc1ac038fb949a94191983716
parent 4216065458c961c8ef9c2120b20090272adc1571
parent df30a52c7c526cf83e4313d0fc0680ae16ba0af6
author Scott Main <smain@google.com> 1333730953 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333730953 -0700

am df30a52c: am b155ec3f: am 96f6139c: Merge "first draft of sample code for AU basic training class on fragments" into ics-mr1

* commit 'df30a52c7c526cf83e4313d0fc0680ae16ba0af6':