tree 0cbada72d66feb82ded9f7e3f36a7f6aeb2b86db
parent 5826e469e9d03eaa5511d413733edde0a1b99048
parent 710b3946e5352cdd132f585fac40bb0361be2a94
author Evan Laird <evanlaird@google.com> 1512402397 -0500
committer Evan Laird <evanlaird@google.com> 1512404682 -0500

Resolve merge conflicts of 710b3946e535 to master

Test: runtest -x
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java

Change-Id: I95ed65102c3d61a0afa0744663d6966c10f876e5