am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 automerge: 7da2b5d

* commit '74e00d229b5e4fca4bffd94373d58f94a74255d5':