Commit 3ba46b5e authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

[automerger skipped] When manipulating flags, |= rather than += am: cdc003dc -s ours 

am: e0a6fe44  -s ours

Change-Id: I0518bdaa1ff59ba7c89a09358c9a212472cc2394
parents 12dc3b7d e0a6fe44
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment