tree 47874ddd1caad611bad68efc67eb366436f30173
parent 7c3a4e5c01de86130625332fc7ed274367b58b4a
parent 01b14b54e435373ad9cea9e366215750301f2be4
author Yu Ping Hu <yph@google.com> 1384567415 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384567415 -0800

am 01b14b54: am 3cc9bd30: am db1ca5f7: Don\'t modify the ping on the main thread.

* commit '01b14b54e435373ad9cea9e366215750301f2be4':
  Don't modify the ping on the main thread.