tree 7ce9992e0b130b7919fba8f203ef37fbe6355262
parent 8f207ca0460c7df2f5ce3b5005312e945c4e48e2
parent 2881d6f31b9daf9a3d701671eae3297040d84799
author smain@google.com <smain@google.com> 1418701318 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418701318 +0000

am 2881d6f3: am 9f88a60d: am 481f15c1: set youtube player lang based on user pref and enable captions when not English

* commit '2881d6f31b9daf9a3d701671eae3297040d84799':
  set youtube player lang based on user pref and enable captions when not English