tree 0e89af8a6217f414b6db27e294f33e91f8beee42
parent a833c9c68ff6c8fe449e9fd9450dda119feaa8da
parent f620ff053cdad336e00ad7ea12a6b644b696f766
author Treehugger Robot <treehugger-gerrit@google.com> 1513730213 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1513730213 +0000

Merge "Default EDITED column to CARRIER_EDITED instead of USER_EDITED"