tree aebbe2028bd3c5c4ff1f9979ed60b7cb01e9bc86
parent d1343b8e284a596616e57a50da9ccd3be3e29a4c
parent 9c2a053bdfa850cfd230e353851ba47988a5eb18
author Aurimas Liutikas <aurimas@google.com> 1513369126 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1513369126 +0000

Merge changes from topics "am-a3b73616-94e3-4904-b24e-d6060cc6ead9", "am-40126c13-0e23-46b1-8090-19823f284fb2"

* changes:
  [automerger] Move tv-provider tests and manifest file to standard gradle directories. am: 73b4198cf4
  [automerger] Move palette tests and manifest file to standard gradle directories. am: 9acd5dc5e9
  Move tv-provider tests and manifest file to standard gradle directories.
  Move palette tests and manifest file to standard gradle directories.