While doing the integration->main merge today, I realized that I misnamed the ChangeLog.google files. If both branches name them the same, merges will be ugly and we won't be able to tell them apart easily.
I renamed all the existing ChangeLog.google to ChangeLog.google-integration. We'll have a ChangeLog.google-main in the other branch. Diego.
