OSDN Git Service

Merge "Properly compute default and system set flag on an upgrade" into oc-dev
authorSvetoslav Ganov <svetoslavganov@google.com>
Thu, 17 Aug 2017 02:34:36 +0000 (02:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Aug 2017 02:34:36 +0000 (02:34 +0000)
commit2800f22eec5d14ce5fb39db9a602059b22653400
tree87e3d9ab75d48a9b57e2dfa0ac316a17b358bc0f
parent1c414bf30b51a27eb96ffa728fb513c4505296b2
parent357f42bf69b69fcbb6c486878cba14632ace69ce
Merge "Properly compute default and system set flag on an upgrade" into oc-dev
am: 357f42bf69

Change-Id: I42b5eabd1e21aa5b7c5ab71b34d5eadada0023aa
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java