tree 29e43320805fcf18cac8dfa7b899319f372e89bc
parent 5d9bb65cc54fb298195d9b8ad64ff1d2fd0e17c8
parent 999536c0c72b266924d7f64937a5e53c511dfb3b
author Colin Cross <ccross@android.com> 1487195663 +0000
committer android-build-merger <android-build-merger@google.com> 1487195663 +0000

Merge "Add missing transitive dependencies" am: 9a92a189f6 am: e1ee607b28 am: 0de8a60c88
am: 999536c0c7

Change-Id: I5d8a479a50bd53edfc96637dfb3281bb01120faf