OSDN Git Service

Merge "Unrevert update references to backup agent timeouts"
authorAnnie Meng <anniemeng@google.com>
Thu, 29 Mar 2018 12:04:40 +0000 (12:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 29 Mar 2018 12:04:40 +0000 (12:04 +0000)

Trivial merge