am cd2e4da9: am 20625cce: am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6
automerge: 2bc2a40

* commit '2bc2a4064ae60c1448eaae112cf6f3df4d8f2daa':
  Support Locale.toLanguageTag on Java 6