tree 9782703c437190265135acfa1d56c85ae1da4488
parent 57bb313b1e271533a2c97c4105d1f16b8d245cdd
parent b648a8781faae3e4584792230382cd9f6e63428f
author Tao Bao <tbao@google.com> 1490896521 +0000
committer android-build-merger <android-build-merger@google.com> 1490896521 +0000

Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." am: 3f0a3a2b1d
am: b648a8781f

Change-Id: I37702cf53e98ee389c2defdea92d99e8596af41e