tree f1800f8e5e89262e8d93859996c4ab9171c3823a
parent ef632b79b463def734e0b5ccba522eabdc0f4556
parent 16f0df8b6be89e7864c61b1fc3408105dacda0b4
author Mathieu Chartier <mathieuc@google.com> 1549925569 -0800
committer android-build-merger <android-build-merger@google.com> 1549925569 -0800

Merge "Revert "Enable layout compilation by default"" am: 5838c3f8bb am: f7f965ca40
am: 16f0df8b6b

Change-Id: Id6a5e6807202391764ca174e28f77aa118030fa2