tree 020c4fe31eb294996054db2b792ab0262f53f5cb
parent e171a310aed865e880e79bebc8deb00866418480
parent 3c980fd8d9afa31e2b15c480d1e9492127fae286
author David Pursehouse <dpursehouse@collab.net> 1536800075 +0900
committer David Pursehouse <dpursehouse@collab.net> 1536800153 +0900

Merge branch 'stable-2.15'

* stable-2.15:
  Make inner classes static where possible
  MigrateToNoteDb: Specify charset when constructing PrintWriter
  IndexServletTest: Specify charset in construction of String
  license-map: Fix deprecation warning
  Bazel: Make 'DefaultCharset' an ERROR when compiling with ErrorProne toolchain
  Specify charset when constructing PrintWriter
  Bazel: Change deprecated single file attribute parameter
  Bazel: Remove deprecated FileType
  Bazel: Replace PACKAGE_NAME constant with package_name() function

Change-Id: Ibe9c2a13f3b0b4bc0ea6239c0158782a6de5b18e