tree cc4dcf8f56cd70c1a5d785bb264887a410fdda20
parent 413ce3b609c00a1da306b45a00daff2023927f05
parent ec901b3133918a2afeb35a37dbf5df530afcda95
author Nicolas Geoffray <ngeoffray@google.com> 1542365614 -0800
committer android-build-merger <android-build-merger@google.com> 1542365614 -0800

[automerger skipped] Merge "Make shared library dependencies explicit in SharedLibraryInfo" am: 550b5e68c1 am: a835f23f47
am: ec901b3133  -s ours

Change-Id: I86b8ca06ddbfd79e71ffb09b15ce7a331347af63