tree 39a9b29a28d204495701300b27efd8f169f6ffe3
parent 322ab10d5a96eb9bda5165222a71eeb21261f4ed
parent ff2af2c7433b34d160959689384aecbc0677830f
author Peter Kalauskas <peskal@google.com> 1531323957 -0700
committer android-build-merger <android-build-merger@google.com> 1531323957 -0700

Merge "Fix error in build when OUT_DIR_COMMON_BASE is used"
am: ff2af2c743

Change-Id: I5995b743e5bbdeaca69b885179230004aec551ab