tree 6ab92c73305b5fbd5daecb1853b4c79bc160d195
parent a1e8fd30efad5550a201aaf11f609a5a53049fd6
parent d14f98d763f117942d726be5d9e69ce6faad399b
author Conrad Chen <conradchen@google.com> 1490811547 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1490811548 +0000

Merge "tv-provider: support Channels.COLUMN_LOCKED" into oc-dev