tree 8925704da3e23d9386671ca175769bd922e31e69
parent 154ff388165c86e0ca117ddd9b01cc4fcd572bc4
parent 028c6bcad475a7ecd505e185439b371acf1451c7
author Android (Google) Code Review <android-gerrit@google.com> 1249419842 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1249419842 -0700

Merge change 9672

* changes:
  Adaptive heartbeat protocol implementation: server configured settings.