tree 14d3c17924ad2f5ecea0d81fcfae086328126f08
parent 783019d2ff2ee87462934bad21a80fcfb99b60a7
parent 90074d1ec8837daef0044137eca8822e4dbc262f
author Chulwoo Lee <chulwoo@google.com> 1493708555 +0000
committer android-build-merger <android-build-merger@google.com> 1493708555 +0000

Merge "Allow null setup activity for TV input" into oc-dev
am: 90074d1ec8

Change-Id: I18545582572c60956548af8c732b7e6543f00d76