am eba9fe3f: Merge change 2492 into donut
Merge commit 'eba9fe3f8e3c6cf448183678a1b2a9987ce4ac71' * commit 'eba9fe3f8e3c6cf448183678a1b2a9987ce4ac71': add Gservices setting for "send message using bareJid timeout".
This commit is contained in:
committed by
The Android Open Source Project
commit
602aa97482