tree 4d9d05e67fc117a6872aa57b3884afb6f21534f1
parent e2f5f4b110ec4cce93d2906569ed6478b0de619b
parent 2800f22eec5d14ce5fb39db9a602059b22653400
author Svetoslav Ganov <svetoslavganov@google.com> 1502937860 +0000
committer android-build-merger <android-build-merger@google.com> 1502937860 +0000

Merge "Properly compute default and system set flag on an upgrade" into oc-dev am: 357f42bf69
am: 2800f22eec

Change-Id: I85fdc058077fa77179e4a5e019cb8368038ee717