tree b999e0922e64a02d72778118a106857c04ecda46
parent d673f4f271670fc5dd1e73d85b9a6009e052605e
parent 43b12f57f787ca2755b16bda3abb85a2eba251ab
author Remi NGUYEN VAN <reminv@google.com> 1532497856 -0700
committer android-build-merger <android-build-merger@google.com> 1532497856 -0700

Merge "Increase TEST_LINGER_DELAY_MS" am: 9a783699cc am: 93c22129e2 am: d2339214eb
am: 43b12f57f7

Change-Id: Iffd1ea689a9cedee4252836de208b506290c067b