| commit | c52f0b61b411974597a87f06b4f2d46caf916cd6 | [log] [tgz] |
|---|---|---|
| author | Evan Laird <evanlaird@google.com> | Mon Dec 04 10:46:37 2017 -0500 |
| committer | Evan Laird <evanlaird@google.com> | Mon Dec 04 11:24:42 2017 -0500 |
| tree | 0cbada72d66feb82ded9f7e3f36a7f6aeb2b86db | |
| parent | 5826e469e9d03eaa5511d413733edde0a1b99048 [diff] | |
| parent | 710b3946e5352cdd132f585fac40bb0361be2a94 [diff] |
Resolve merge conflicts of 710b3946e535 to master Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java Change-Id: I95ed65102c3d61a0afa0744663d6966c10f876e5