Skip to content
Commit 2dcc550c authored by Dave Mankoff's avatar Dave Mankoff Committed by Android (Google) Code Review
Browse files

Merge changes I29bf2065,Ic858826c,I7fe0bd12 into tm-qpr-dev 

* changes:
  Define server flag names for all existing flags.
  RESTRICT AUTOMERGE Resynchronize QPR flags with Main
  Add server flag support to flags.
parents 2bb38bf2 57d1b2af
Expand all 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