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

* commit '686160b854e845b79f74a526b397bb6dc438392b':