| commit | b7b5e6f2b203ac9df5d8fa748f6aafd160270f9b | [log] [tgz] |
|---|---|---|
| author | Justin Klaassen <justinklaassen@google.com> | Fri May 20 17:16:23 2016 -0700 |
| committer | Justin Klaassen <justinklaassen@google.com> | Fri May 20 17:16:23 2016 -0700 |
| tree | 00a7486ab4f539db6013d39cb1cf292c7a3a5c25 | |
| parent | 427c5a6bc0c06b3e65f5de2433b917dd02f990bb [diff] | |
| parent | 270e0e33f661dc7a726b0c64d4227a54d3068946 [diff] |
resolve merge conflicts of 270e0e3 to ub-deskclock-fantasy Change-Id: I46701d5f4b60b3856f77ffde5c2ef588ea9f7245