tree 89fcec69a609b1c9c29e1ba261e3e8ba49e0173e
parent deb3dfea53a2425cbda9995aa79875249416a909
parent 5b7bf29949ac49433aafd207a5a6dd136016417a
author Irina Dumitrescu <irinaid@google.com> 1555676490 -0700
committer android-build-merger <android-build-merger@google.com> 1555676490 -0700

[automerger skipped] Merge "Don't call ConnectivityService when holding ActivityManagerService lock." am: 31c89ed72e
am: 5b7bf29949 -s ours
am skip reason: change_id Ia2b2c6de8a01a264bfb09393144641d91ee2c164 with SHA1 34a27c4c45 is in history

Change-Id: I8920ed9d2fcb86d618121cab7ed25279b2657565