tree ff7ffe5d115b3c2c3564829eedf3268168bc2219
parent 541f9cf57691bae562415ca89e6e333c8114bc48
parent 2aa649593be8ff1d2aa838fa2b4ea2f45ff4deda
author Colin Cross <ccross@android.com> 1496194646 +0000
committer android-build-merger <android-build-merger@google.com> 1496194646 +0000

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

Change-Id: Ie28b57bd8ed157a7a34a5224bf3f52d7818b6205