| commit | cd75c1214cf230003814798945ef4b111ba87fa0 | [log] [tgz] |
|---|---|---|
| author | James Lemieux <jplemieux@google.com> | Mon Aug 03 12:39:50 2015 -0700 |
| committer | James Lemieux <jplemieux@google.com> | Mon Aug 03 12:39:50 2015 -0700 |
| tree | 0f156dfb56ed1ddcd8156b5e280764fa6e2d469e | |
| parent | a0d3da4ee979b38397770b89bd97118bb6d1bfb6 [diff] | |
| parent | 5407d5c3b5a457d69eb1c9315186bcbcfa02f9c6 [diff] |
resolved conflicts for merge of 5407d5c3 to ub-deskclock-charm Change-Id: I069373d9859bc3f7dea5a9e3f1a939e6bdc6753a