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

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

Change-Id: Ie41c26846d6a2fb78135b189d1a09d57e1ec794a