tree b433d1c18a264fd5bd574f2d008797993077738d
parent 3cf39b018c6ddd2d7e051e06e89970f2ee80fa02
parent 5cf18abca9b674c44d39e83059b1bfaafac03607
author Lorenzo Colitti <lorenzo@google.com> 1481196746 +0000
committer android-build-merger <android-build-merger@google.com> 1481196746 +0000

DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest. am: 5bce5a16b1  -s ours am: efd928fe56  -s ours
am: 5cf18abca9

Change-Id: I1846d606bdcc35b099f03554107f8ccfe0704a93