tree b32627a8422c7fa8ac911eed5ab8fd1e2615ce1e
parent 6683494c94814c8a84c2ec2c9a3e8534eed34cc6
parent a4982eb5dd0db3442c60b2881c2ab20429bf5ecc
author Colin Cross <ccross@android.com> 1496193720 +0000
committer android-build-merger <android-build-merger@google.com> 1496193720 +0000

Merge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals"
am: a4982eb5dd

Change-Id: Ic7700b1974d2d3aa3df0c55003ee6c16c1ba6ece