| commit | 2e5b50231a508c503b1622cad593e9ec1941555f | [log] [tgz] |
|---|---|---|
| author | Justin Klaassen <justinklaassen@google.com> | Thu Feb 11 15:18:23 2016 -0800 |
| committer | Justin Klaassen <justinklaassen@google.com> | Thu Feb 11 15:18:23 2016 -0800 |
| tree | df9e44d5ef9867c1dd1e01e26d2629134a41cca5 | |
| parent | 0708d31afa03f3773076bfa2ae24b460cfc55d53 [diff] | |
| parent | 0e2a4aba2654f2b4d114b4b466e5610200d6e3b7 [diff] |
resolve merge conflicts of 0e2a4aba26 to ub-deskclock-fantasy Change-Id: I09db64968811a267db08a823df5086a29cc0e356