resolved conflicts for merge of 9583d2ed to jb-mr2-dev

Change-Id: Ib6c5f18a2b6429ef8bbca577e8cabcab26dc6ca1
2013-03-22 13:05:32 -07:00
parent 11ad495f11 9583d2ed3a
commit a7a51a397e
2 changed files with 4 additions and 1 deletions
--- a/sdk/build_tools_source.properties
+++ b/sdk/build_tools_source.properties
@@ -0,0 +1,3 @@
+Pkg.UserSrc=false
+Pkg.Revision=17.0.0
+
--- a/sdk/plat_tools_source.properties
+++ b/sdk/plat_tools_source.properties
@@ -1,2 +1,2 @@
 Pkg.UserSrc=false
-Pkg.Revision=16.0.2
+Pkg.Revision=17.0.0