tree c7a3f0ecf9860881cf72c4b220dd5981c761768b
parent 0394eb0e5f614a9650dc1411e9e24e3071996d6b
parent 438a8e9e1a9dd090d157154f5aa7b0ecfa1196fd
author Beverly Tai <beverlyt@google.com> 1504803657 +0000
committer android-build-merger <android-build-merger@google.com> 1504803657 +0000

Merge "Ensures zen rule update locale retains enabled val" into oc-mr1-dev
am: 438a8e9e1a

Change-Id: I06d7b5d565e8713b2e3e91d9845581fbe0fd62a2