tree 44a445d08f52f47346a429dbc3b50228a8f54bb6
parent 48a9d8f52191c91e4d90fc5d79c76c0bbf1a6583
parent 7557b76dc23d9bfcc37c785eb2dd2fb1adf6f878
author Wink Saville <wink@google.com> 1357930433 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357930433 -0800

am 7557b76d: Merge "Changed timeouts for Stk"

* commit '7557b76dc23d9bfcc37c785eb2dd2fb1adf6f878':
  Changed timeouts for Stk