tree b1ddc63957b7943c36eeb775eff882ffbdf21382
parent faf0bbf2b8d2988ad712d7d5c575cd504716fd4b
parent 0c44ba4eda92216fdac01866e5efe9092be8f545
author Mathieu Chartier <mathieuc@google.com> 1549908519 -0800
committer android-build-merger <android-build-merger@google.com> 1549908519 -0800

Merge "Enable layout compilation by default"
am: 0c44ba4eda

Change-Id: I64b5cc14ce4797c8f6c50d9b89f826161cd0b47e