Skip to content
Commit aa1642d8 authored by Yeabkal Assegid Wubshit's avatar Yeabkal Assegid Wubshit Committed by Android (Google) Code Review
Browse files

Merge changes from topics "LWBS-master", "fused_location-master" 

* changes:
  Add battery-saver and combined-location Setting keys to backup test
  Rename PLAY_STORE_AVAILABILITY with PHONE_PLAY_STORE_AVAILABILITY.
  Add new key to System Content Provider for combined location
  Move KEY_BURN_IN_PROTECTION to Settings.Global
  [Ambient Lite] Add a WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS setting.
  Add new keys to Settings Content Provider for Battery Saver
parents 3cf33373 9750a9d6
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment