commit | 98e4adf942fe3ade14225875fdb018efe941e99f | [log] [tgz] |
---|---|---|
author | Scott Main <smain@google.com> | Thu Dec 15 19:55:00 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 15 19:55:00 2011 -0800 |
tree | e250e356181352dd2bbd8ad25ea62b50cc375311 | |
parent | ec09b2691ef24e25d28d9946c722d154b6067224 [diff] | |
parent | 26e461b34f5f9eef79aa30f1304cca4262ff88ed [diff] |
am 26e461b3: am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0 * commit '26e461b34f5f9eef79aa30f1304cca4262ff88ed': Doc merge from master:Training class on Identifying and Authenticating Users.