tree df9e44d5ef9867c1dd1e01e26d2629134a41cca5
parent 0708d31afa03f3773076bfa2ae24b460cfc55d53
parent 0e2a4aba2654f2b4d114b4b466e5610200d6e3b7
author Justin Klaassen <justinklaassen@google.com> 1455232703 -0800
committer Justin Klaassen <justinklaassen@google.com> 1455232703 -0800

resolve merge conflicts of 0e2a4aba26 to ub-deskclock-fantasy

Change-Id: I09db64968811a267db08a823df5086a29cc0e356