tree c5b2115154ee602bd2be473962a9e62c2e58ef1e
parent 96b1534e01ec0cbb807afc806afee6bb0015b656
parent 58eef7e4cf004857d1accef9b1bf4fed87ecf76b
author Android (Google) Code Review <android-gerrit@google.com> 1243378368 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1243378368 -0700

Merge change 2355

* changes:
  add Gservices setting for "send message using bareJid timeout".