tree 33ac782ddb5286e42e0010371b7b0266cc71c360
parent ae81bd439286cd506675e78eefca3bc923a7f477
parent 80c511416fe217806b6a609623d3ef91e8eb9e95
author Sundong Ahn <sundongahn@google.com> 1538631781 -0700
committer android-build-merger <android-build-merger@google.com> 1538631781 -0700

[automerger skipped] Merge "Add the metalava_enabled property" into pi-dev-plus-aosp
am: 80c511416f  -s ours

Change-Id: Id7b7c7df508fed06b793de0c92d34665f44b1d34