Skip to content
Commit 20c4d352 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by android-build-merger
Browse files

Merge "Merge "Properly compute default and system set flag on an upgrade" into... 

Merge "Merge "Properly compute default and system set flag on an upgrade" into oc-dev am: 357f42bf am: da4e8f2d" into oc-dr1-dev-plus-aosp
am: 9706d800  -s ours

Change-Id: I5f3cd8aa863c90532383b6615bbc3bc731323582
parents 997c434e 9706d800
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