Merge heads

2013-08-15 09:46:14 +08:00
parent 4d8c44782e
commit d64b6a4d93
30 changed files with 785 additions and 189 deletions
@@ -43,7 +43,7 @@ public class WaypointCreationRequestTest extends AndroidTestCase {

  public void testAllAttributesParceling() {
    WaypointCreationRequest original = new WaypointCreationRequest(
-        WaypointType.WAYPOINT, false, "name", "category", "description", "img.png");
+        WaypointType.WAYPOINT, false, "name", "category", "description", "img.png", null);
    Parcel p = Parcel.obtain();
    original.writeToParcel(p, 0);
    p.setDataPosition(0);