tree b1c082d269880ea829faf55028878b3da35827d7
parent cfc68b66618076e3eaf49f52d134846a8de22674
parent 0b81f9727f5f67192058bbe82c8ce23467971924
author Treehugger Robot <treehugger-gerrit@google.com> 1496193185 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1496193186 +0000

Merge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals"