tree cca6e7f0af3f1ab7c447946570b1f45c370beb98
parent 31278350b9fe72f00030f43108868b563948ca73
parent a861a9d713c99b576c0e7284a65d50838c4f953a
author Dianne Hackborn <hackbod@google.com> 1413316719 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413316719 +0000

am a861a9d7: am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev

* commit 'a861a9d713c99b576c0e7284a65d50838c4f953a':
  Fix issue #10034864: Define YouTube application as the preferred...