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