tree 9e34129dba00354c7e2ab5d57cd43278036d2b89
parent b3d418ad027c324c1169e7087689a81bfefdf7f3
parent c5871ea1b830153e7f85367844bcc67b81a2c06b
author Deepanshu Gupta <deepanshu@google.com> 1420862204 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420862204 +0000

am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6

* commit 'c5871ea1b830153e7f85367844bcc67b81a2c06b':
  Support Locale.toLanguageTag on Java 6