Merge "Descriptor Unification"
[osm/SO.git] / manifest / LICENSE