tree df2b9f7e21539da3a0f5dbd3a8eedcc18d7ee7f6
parent aa60c74f5d11621c0435b349c81da25a5fded3da
parent 845c0cf812d9dd0ae950abe14e32e58a0c6bec0a
author Sujith Ramakrishnan <sujithrk@google.com> 1504787946 +0000
committer android-build-merger <android-build-merger@google.com> 1504787946 +0000

Merge "Make ASSIST launch VIS and add a keycode for TV (ALL_APPS)" into oc-dev am: c07c23b1f7  -s ours am: 1255f26551 am: b04db40842
am: 845c0cf812

Change-Id: I8aff50265f48590f3549ac5fdb7f0256dc476132