tree b19cb94f3ad3155027597d8a9834d4de23896dce
parent b2e09827bd0c6b9e339c69dca254ab9d96b37430
parent 653b982d1877b7a8eb998229c488bd8ebcee2057
author Erik Wolsheimer <ewol@google.com> 1477071425 +0000
committer android-build-merger <android-build-merger@google.com> 1477071425 +0000

Merge "DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time" into cw-f-dev
am: 653b982d18  -s ours

Change-Id: Icceb19699edb6db18091844d22516eff8ac7bc4d