This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
The SourceForge manual cannot be linked to sections directly because
of JavaScript and HTML frames. I used the MIT links from the bug
report instead.
Review: http://quixote.mtv.corp.google.com:8001/tools/help/proguard.html
Change-Id: I1be210d392d78a7560a89f421074ba6d99499da0
