tree cb3e47faa781a32305a0786e0bdc30d0b572180c
parent c7d76ba340616a0a015f1cdac63b1a1432effccc
parent bb8f63f368b12adf144f23abc29809df2dec08cd
author Jayant Chowdhary <jchowdhary@google.com> 1503077944 +0000
committer android-build-merger <android-build-merger@google.com> 1503077944 +0000

Merge "Make -so optional for better testability." am: 0b9c3e0a3a
am: bb8f63f368

Change-Id: Ic9bb222a9b3090ef48b2477dc7dcd6a7c93348e6