tree 03327f50b97f4dbd0235eb729d076cdb4c92b73a
parent b6333b34a2d6e265edf2a052646b07c0b1456ab6
parent fec880df27adeb901a0e936e7bf3f944d8b95cb7
author Dirk Dougherty <nobody@android.com> 1243030386 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243030386 -0700

am 22629944: AI 149208: Remove statement about WIndows codecs and licensing.   BUG=1839672

Merge commit '226299446197689499bc3c7dc44d0026745da677' into donut

* commit '226299446197689499bc3c7dc44d0026745da677':
  AI 149208: Remove statement about WIndows codecs and licensing.