OSDN Git Service

Merge "Guard against null server" into pi-dev
authorJerry Zhang <zhangjerry@google.com>
Tue, 27 Mar 2018 18:52:15 +0000 (18:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Mar 2018 18:52:15 +0000 (18:52 +0000)
commitc5febd24e063c8a77c6b35b3470260899d2e8485
treed5dccfcfc440e30c1833af85fe72c1a8e64f6dcb
parent5c7fe1524ef1e81d44aafb86a43a9a717887d72d
parentbb54f62d1a7afc2879a576267f753ad898c09a3d
Merge "Guard against null server" into pi-dev
am: bb54f62d1a

Change-Id: I6a35fcd7b27e04ae207fafca9f504bfaad174035