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)
commita41e7b87dc0475ee146c29cd53d4ad2dd02adac6
treed21b2a6f3b214d189e16dd9810367c7fa027f5d1
parent6033ab604ff75bcd685b510625c9f612a83b76c5
parent2800f22eec5d14ce5fb39db9a602059b22653400
Merge "Properly compute default and system set flag on an upgrade" into oc-dev am: 357f42bf69
am: 2800f22eec  -s ours

Change-Id: I767ece0ec5b60ef92da2e6ebe394bdcf2e966328