tree a5a1a310070cad89ee8aaa86d3b1b874f9d29610
parent aa3be062b918cae21a33589801a78f692c864166
parent ed9e5cb30b20df6bded4b147d88c7986e19595e6
author Android (Google) Code Review <android-gerrit@google.com> 1243386187 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243386187 -0700

am eba9fe3f: Merge change 2492 into donut

Merge commit 'eba9fe3f8e3c6cf448183678a1b2a9987ce4ac71'

* commit 'eba9fe3f8e3c6cf448183678a1b2a9987ce4ac71':
  add Gservices setting for "send message using bareJid timeout".