tree 424a65f768f628f3b959dc2dae057087f7ceb59c
parent 0f81f419edaf58d8281268ec01fc3ea7c3eee39d
parent 9a66c537119de769608535da9456a49f2ae9f150
author Tetsutoki Shiozawa <tetsutoki.shiozawa@sony.com> 1527272699 -0700
committer android-build-merger <android-build-merger@google.com> 1527272699 -0700

[automerger skipped] Merge "Fix: ConnectivityManager is initialized with a wrong context" am: 4517eacd5d am: 356edc5fe4  -s ours
am: 9a66c53711  -s ours

Change-Id: Iaa4b1f2ce6bdc1139fae501ec60c282ca4609396