tree 9dcf9716229ca942978150cd538e93fde315e011
parent 9f41558f582c1f5e867fdd85688dd2d3af9d3402
parent e467f553b90b3f9cbdc5b43919f3ed65f8a47052
author Jerry Zhang <zhangjerry@google.com> 1532392323 -0700
committer android-build-merger <android-build-merger@google.com> 1532392323 -0700

[automerger skipped] Merge "Allow libfec to be a shared library." am: 057e535e24  -s ours am: 696ab3cde2  -s ours
am: e467f553b9  -s ours

Change-Id: I784c43805ee79cd755ad0da1463b26848b0d2ae4