| commit | 86aa1efc9492296367328a59b76cbda4b42cdb90 | [log] [tgz] |
|---|---|---|
| author | telmoagostinho <telmo.agostinho@gmail> | Wed Jun 24 19:21:41 2015 +0100 |
| committer | telmoagostinho <telmo.agostinho@gmail> | Wed Jun 24 19:21:41 2015 +0100 |
| tree | 47048e3386b6631ee13c7fd23ab7bd9c2a3669e6 | |
| parent | e37bd7a505af67635f06a2dc619a5988f7dffa45 [diff] | |
| parent | 6c8e2330344cdcfdad82365ea06fc3e73ea708ca [diff] |
Merge branch 'master' of https://bitbucket.org/KwamecorpNinjas/fairphone_prototype_clock_widget Conflicts: res/layout/clock_widget_main.xml
