tree 64bf6e51b0485874687b792ed404b745e20ac9fa
parent 1c4d775671bfe31907b92aa22647fc22b7d9134c
parent 8ffbe8835c5263a12149a76457133f5c048884c8
author Martin Hibdon <mhibdon@google.com> 1414958846 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414958846 +0000

am 8ffbe883: am 468fe55d: am 720815ba: am 59feae0b: am 60900e83: Merge "Enable the automatic hourly ping kick" into ub-gmail-ur14-dev

* commit '8ffbe8835c5263a12149a76457133f5c048884c8':
  Enable the automatic hourly ping kick