commit | 27c7a7d06b488ad0b23ce02c88bc02b35ed8361e | [log] [tgz] |
---|---|---|
author | Dongwon Kang <dwkang@google.com> | Fri Oct 24 03:24:49 2014 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Oct 24 03:24:49 2014 +0000 |
tree | c07672da91fb82c2738effd9cac28e1da5e5face | |
parent | 8991001fec08094100113cc5a94cf0d6cbad0f8e [diff] | |
parent | d048789aeaf64779a7062faa3bd806c69652857a [diff] |
Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev automerge: f6df7bf automerge: d048789 * commit 'd048789aeaf64779a7062faa3bd806c69652857a': TIF: Define more cannonical genres in TvContract