am 64f04a64: am 70736a6d: Merge "Avoid starting multiple threads in...
am 64f04a64: am 70736a6d: Merge "Avoid starting multiple threads in ShutdownThread" into gingerbread
Merge commit '64f04a64'
* commit '64f04a64':
Avoid starting multiple threads in ShutdownThread