| commit | f029a6ed8ef1d09a69864aeaa2a519c07385a127 | [log] [tgz] |
|---|---|---|
| author | Justin Klaassen <justinklaassen@google.com> | Thu Feb 25 12:32:26 2016 -0800 |
| committer | Justin Klaassen <justinklaassen@google.com> | Thu Feb 25 12:32:26 2016 -0800 |
| tree | bacaff182ed1107e571406fb1cc9beed8d34295c | |
| parent | 815d62f71043080062504b93b094be5996c1ed6b [diff] | |
| parent | 0ce0945fa416b21e0e9577da6f761045ffccf9ce [diff] |
resolve merge conflicts of 0ce0945fa4 to ub-deskclock-fantasy Change-Id: I30f35a951218f481a0fc02a2d206338d7b9416db