tree 6e8e3a5b02838880eab615e75669049fec2a2e0b
parent 6d17312448778f36ecaa3a3ec6324dcaa0b251cb
parent 3009684b9460753df7dec129e26b15c66128fc9f
author Dan Willemsen <dwillemsen@google.com> 1529448138 -0700
committer android-build-merger <android-build-merger@google.com> 1529448138 -0700

[automerger skipped] Remove LOCAL_ADDITIONAL_DEPENDENCIES
am: 3009684b94  -s ours

Change-Id: Idec3387945ec3caca38a0057df453229d2560fa5