tree 65a9d0ce22803ba48c66262d4ac9b6de3830311f
parent 3ab8e8847d723fd3b114a4c895c5eeb4623412f4
parent 484ff7a92298eaeb5e7edc39895b3a26bed704b3
author Lajos Molnar <lajos@google.com> 1378330363 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1378330363 +0000

Merge "Add subtitle support to VideoView." into klp-dev