tree 5a71e60febae01bf499f475d8dff8187fa07819c
parent 5e12aa1757a3b0a13adfe1beaace546d8d02963b
author Kane Ho <hkho@google.com> 1476723040 -0700
committer Tony Mak <tonymak@google.com> 1490394536 +0000

Fixing couple issues

1. Split the layout into two, for watch-specific and everything else.
2. Disable proximity sensor test for watch.

Bug:31672333,31223299
Change-Id: Iad40cfff31510328165a145b3731d9e3839da561
(cherry picked from commit e63db3ba06062b65b6b97737737e5be3114cf265)