| commit | 0bb66fe7eb88dc50c20f4ae9811f3cad974cca3c | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Fri Jan 11 10:53:53 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 11 10:53:53 2013 -0800 |
| tree | 44a445d08f52f47346a429dbc3b50228a8f54bb6 | |
| parent | 48a9d8f52191c91e4d90fc5d79c76c0bbf1a6583 [diff] | |
| parent | 7557b76dc23d9bfcc37c785eb2dd2fb1adf6f878 [diff] |
am 7557b76d: Merge "Changed timeouts for Stk" * commit '7557b76dc23d9bfcc37c785eb2dd2fb1adf6f878': Changed timeouts for Stk