tree e250e356181352dd2bbd8ad25ea62b50cc375311
parent ce5643c7c43c2c680e683c56507ffa1bf5b9a316
parent 5dac1976198e5fa553749cd145c7484f3ff45c6b
author Scott Main <smain@google.com> 1324007570 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1324007570 -0800

am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0

* commit '5dac1976198e5fa553749cd145c7484f3ff45c6b':
  Doc merge from master:Training class on Identifying and Authenticating Users.