kenton@google.com d37d46dfbc Integrate recent changes from Google-internal code tree. See CHANGES.txt %!s(int64=16) %!d(string=hai) anos
..
java d37d46dfbc Integrate recent changes from Google-internal code tree. See CHANGES.txt %!s(int64=16) %!d(string=hai) anos