[automerger skipped] Merge "Fix: ConnectivityManager is initialized with a wrong context" am: 4517eacd5d

am: 356edc5fe4  -s ours

Change-Id: Ibdbd1d7b667506ac14b8cc487d17d11f82a993b0
This commit is contained in:
Tetsutoki Shiozawa
2018-05-25 11:12:35 -07:00
committed by android-build-merger

Diff Content Not Available