tree a8b8a21035b6c977ed330022082e9098dfb0ebeb
parent 7419ebc96fa5ae665dd4426dc5a4277c9ae1f325
parent 0767349f88ea997ed8fbdf6a2225e031c1aa40c2
author Android (Google) Code Review <android-gerrit@google.com> 1243386128 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1243386128 -0700

Merge change 2492 into donut

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