tree a0e0dc3e0cb62bf4655bafbefe247fb67ad1f43f
parent de0fb617a198babe1a67c0dc921d0e7703f73384
parent cd62f3aed68b35ac6e1f4f7b0594c695663fc8ba
author William Mee <williamm@google.com> 1485881684 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1485881688 +0000

Merge "Added a new wifi_badging_thresholds setting to Settings.Global"