OSDN Git Service

Merge "Properly compute default and system set flag on an upgrade" into oc-dev am...
authorSvetoslav Ganov <svetoslavganov@google.com>
Thu, 17 Aug 2017 02:44:01 +0000 (02:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Aug 2017 02:44:01 +0000 (02:44 +0000)
am: 2800f22eec  -s ours

Change-Id: I767ece0ec5b60ef92da2e6ebe394bdcf2e966328


Trivial merge