Merge "Merge remote-tracking branch 'github/develop' into upstream." …

…into ub-games-master
google · Jul 15, 2015 · fad52c7 · fad52c7
2 parents 0765991 + 46f7237
commit fad52c7
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/disttools/config.json b/disttools/config.json
@@ -123,6 +123,16 @@
       "is_library": 1,
       "third_party": 1,
       "push": 0
+    },
+    {
+      "name": "cardboard-java",
+      "url": "https://github.com/googlesamples/cardboard-java.git",
+      "branch": "master",
+      "revision": "c2a953d093ef7b29b9b0a113c7d5d104fe5d188d",
+      "is_library": 1,
+      "third_party": 0,
+      "prebuilts" : 1,
+      "push": 0
     }
   ]
 }