commit | 997c434ed8f4af25aaa9c6d1afd9af479d9260ba | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Aug 17 02:56:01 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 17 02:56:01 2017 +0000 |
tree | 965f84bdd6e3f3a048e179bfe6d0004e4afc153c | |
parent | 9e323cdb2a761297b221f58113db7e440bb8f644 [diff] | |
parent | 5a7c6adb24eea7c0e0e7816ddb152dd95c95dc3b [diff] |
Merge "Merge "Properly compute default and system set flag on an upgrade" into oc-dev am: 357f42bf69 am: 2800f22eec am: ec5dcff9cd -s ours" into oc-mr1-dev-plus-aosp