tree 0fb96ca07eac7a9c5619a52828e0df5bfaeeb762
parent 56e7e260eeeec27da1dbfb2259f8daf04edca02e
parent c632498ee4b98ce426c55d7bda4ecc73521aaf26
author Martin Brabham <optedoblivion@google.com> 1508537842 +0000
committer android-build-merger <android-build-merger@google.com> 1508537842 +0000

Merge "Updates to support FEATURE_WATCH devices"
am: c632498ee4

Change-Id: Ib06ab8a90f16aeb25a6395f38547ab53c184e97b