tree bf19a51d1801940acf2bed892bd776e56ed14fed
parent 0299546d3831c533a071cdd75fdc0a1c3539c719
parent f43a1577dbf022f23cb1c2893368ebb5f0fcbe94
author Daniel Xie <dxie@google.com> 1442952594 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442952594 +0000

am f43a1577: am 076a77bf: am 247fa4ba: am a79f552d: am 3b0dc26b: Merge "Ensure JobScheduler Connectivity CTS reenables WiFI" into lollipop-cts-dev

* commit 'f43a1577dbf022f23cb1c2893368ebb5f0fcbe94':