OSDN Git Service

Merge "DO NOT MERGE Unrevert update references to backup agent timeouts" into pi-dev
authorAnnie Meng <anniemeng@google.com>
Thu, 29 Mar 2018 13:15:23 +0000 (13:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Mar 2018 13:15:23 +0000 (13:15 +0000)
commit614f40a01b94b8fe12337f2290f482fc2dad67cf
treebb4838ffbcdde6a5af20af28ea9aa1015ef33531
parent07e1c83bad1c25472f591bcd977532b4f23e16ca
parent3594cd54aaaca5a992fc946e3e06074e9c9575f2
Merge "DO NOT MERGE Unrevert update references to backup agent timeouts" into pi-dev
am: 3594cd54aa

Change-Id: Ic7e207d39529aa292938910352d6b0c420f23d88