am 2329b721: (-s ours) am bc0b8ff2: Merge "Use a less misleading name for the code that sets up the main thread."

* commit '2329b7218e2ca65767020f135b524d1c22957791':
This commit is contained in:
Elliott Hughes 2015-08-27 05:04:01 +00:00 committed by Android Git Automerger
commit 0931e46f64

Diff Content Not Available