Skip to content
Commit c52f0b61 authored by Evan Laird's avatar Evan Laird
Browse files

Resolve merge conflicts of 710b3946 to master 

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

Change-Id: I95ed65102c3d61a0afa0744663d6966c10f876e5
parents 5826e469 710b3946
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment