Merge branch 'p-ti-android-3.8.y-video'
authorSundar Raman <a0393242@ti.com>
Fri, 26 Jul 2013 21:05:51 +0000 (16:05 -0500)
committerSundar Raman <a0393242@ti.com>
Fri, 26 Jul 2013 21:05:51 +0000 (16:05 -0500)

Trivial merge