commit | bde21511ddefd11a11be6e414542aee3adc936b9 | [log] [tgz] |
---|---|---|
author | Scott Main <smain@google.com> | Thu Dec 15 19:57:21 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 15 19:57:21 2011 -0800 |
tree | 76a85ebc08e2538fb6a27cea972455efcc38a856 | |
parent | 2f92095ec78b604649cc318f82707eee8b0a6fb4 [diff] | |
parent | 63752fc830be6f83d061806c33b42d8abb4cdf19 [diff] |
am 98e4adf9: am 26e461b3: am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0 * commit '98e4adf942fe3ade14225875fdb018efe941e99f': Doc merge from master:Training class on Identifying and Authenticating Users.