| commit | ca61c255785b2b6be8ec6cbdd096843c0539bc42 | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Thu Jun 03 11:14:40 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 03 11:14:40 2010 -0700 |
| tree | 3a0a41bdbfdeec18431ffbb1d59677b6bb8122fe | |
| parent | 4223830c65d99c0db03557ab23bd628db7e76f9f [diff] | |
| parent | a496684019497395b71c6d460501197a74e21e0e [diff] |
am a4966840: am de3e5665: Add phase2 authentication settings Merge commit 'a496684019497395b71c6d460501197a74e21e0e' into kraken * commit 'a496684019497395b71c6d460501197a74e21e0e': Add phase2 authentication settings