Skip to content
Commit c1220111 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE ANYWHERE: Allow NetTransitionWakelock to be overridden via... 

Merge "DO NOT MERGE ANYWHERE: Allow NetTransitionWakelock to be overridden via Settings" into oc-wear-dev
parents d07b3477 95434b51
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