tree 1e7afed8ff0231c6b168062fa8f04396d6eb7f2f
parent 6bd6d21962d443396747931ae842aece3dbef90f
parent 60e96a56b433781d2f8db30fd188af167fc51277
author Romain Guy <romainguy@google.com> 1284575857 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284575857 -0700

am 282315e1: am 52e19d59: Merge "Change the keep alive time for excess idle threads." into gingerbread

Merge commit '282315e154b63a2eec84609600c81ad9e1c72994'

* commit '282315e154b63a2eec84609600c81ad9e1c72994':
  Change the keep alive time for excess idle threads.