tree 24b64906249d4ed629cd9216e236ba894dbac1cf
parent 9489540144996987d308bf9addfaea758619dacb
parent 9f4fa014faa334f36f9e824c9ea8b8f5ac0eb50c
author goneil <goneil@google.com> 1513730515 +0000
committer android-build-merger <android-build-merger@google.com> 1513730515 +0000

Merge "Default EDITED column to CARRIER_EDITED instead of USER_EDITED" am: ae17a07ec5
am: 9f4fa014fa

Change-Id: Id22758e7533eaa893a3a8ed2c5989fec05773a3c