tree 6b36fbb60f4549a400d9bfd8269cc0817bf927e4
parent 44ad47d102c9ebb33d121cbf014401d921cb6b13
parent 1c8ca2b2cc888549c6b9b211808c54bcb38ba6da
author Mitch Phillips <mitchp@google.com> 1571954978 -0700
committer android-build-merger <android-build-merger@google.com> 1571954978 -0700

Merge "Make libstatslog static-linkage compatible." am: 871d5592ff am: 33f59669ff
am: 1c8ca2b2cc

Change-Id: Ie698eb0bc2cc05c2daf54983542ee059005e5c1f