Tony Wickham a72f49cfc4 resolved conflicts for fa3c369c to ub-launcher3-master ...

Change-Id: I6bfc3d3b731a414060d86d4f1dfc5480c279edc9

2015-10-09 10:05:56 -07:00

..

DummyWidget.java

Moving a few testing classes to a separate package

2015-10-07 11:12:38 -07:00

LauncherExtension.java

resolved conflicts for fa3c369c to ub-launcher3-master

2015-10-09 10:05:56 -07:00

MemoryDumpActivity.java

Moving a few testing classes to a separate package

2015-10-07 11:12:38 -07:00

MemoryTracker.java

Moving a few testing classes to a separate package

2015-10-07 11:12:38 -07:00

ToggleWeightWatcher.java

Moving a few testing classes to a separate package

2015-10-07 11:12:38 -07:00

WeightWatcher.java

Moving a few testing classes to a separate package

2015-10-07 11:12:38 -07:00