tree c34b3a298a7d08b13baec8740f07b70625fadda1
parent f235449efb77f925262cb63e85ab3b197a94d2e5
parent f6df7bff53d325e11233bc08fbf5a3f212723b79
author Dongwon Kang <dwkang@google.com> 1414120615 +0000
committer android-build-merger <android-build-merger@google.com> 1414120615 +0000

Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev
automerge: f6df7bf

* commit 'f6df7bff53d325e11233bc08fbf5a3f212723b79':
  TIF: Define more cannonical genres in TvContract