tree 2421433ae0b8b408fd916eb4574e90b53d71001b
parent 8f21cb5094bceab095d1b1c14c5279e1deb70ee4
parent 7757b14c3b0b58102e5a91b092cb6a4bb03b6d18
author Chiachang Wang <chiachangwang@google.com> 1554989653 -0700
committer android-build-merger <android-build-merger@google.com> 1554989653 -0700

[automerger skipped] Merge "Add lifecycle tests to NetworkMonitorTest" into qt-dev
am: 7757b14c3b -s ours
am skip reason: change_id I1202626face33cc1e1ec02016b95da487b3335c8 with SHA1 cdef556adf is in history

Change-Id: Ie8af0987ed1576f3f54383305c1d9e94886bc840