32dbc03c73
This sorts every entry, so we should have more stability and fewer merge conflicts in future. Change-Id: Ifc5347dc53352da22c82d41ca59b483966fcfc6b