tree ac4db55bdf6cba4d2d4cc9d4d906bc36254280a6
parent 1cb53d6888256791a9990670e2ecb461f88b0134
parent 2cd2d23440470e12e24e8b406ca082f0586cb3d1
author Wei Wang <weiwa@google.com> 1494005015 +0000
committer android-build-merger <android-build-merger@google.com> 1494005015 +0000

Merge "Add wifi throttling to backup blacklist." into oc-dev
am: 2cd2d23440

Change-Id: Ibfa48a05769784cf688e5b35695c3a8369ac263c