tree a89a5162fbb27057a9b4172572bab88f56ec4b04
parent 97c11fe3255dca23dad241bf7025a88a7336f4a1
parent 708e6bc6526990f447326d13702e79d5630303b8
author Eino-Ville Talvala <etalvala@google.com> 1339707766 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1339707766 -0700

Merge "Remove Disco video from builds." into jb-dev