tree d993c172de59354f4597a32913f800ec8d158290
parent 06815c9ee9795abd1643cbc260ba2e8dd2535312
parent 712416aaee60976f6b10d2228c35478beea97532
author Elliott Hughes <enh@google.com> 1430880713 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1430880713 +0000

Merge "Add some missing 'static's."