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

* commit 'a7a51a397e3500b91649bb5a46e7169865151515':
  SDK: Build/Platform-tools revision 17.
This commit is contained in:
Raphael Moll
2013-03-22 20:09:07 +00:00
committed by Android Git Automerger
2 changed files with 4 additions and 1 deletions

View File

@@ -0,0 +1,3 @@
Pkg.UserSrc=false
Pkg.Revision=17.0.0

View File

@@ -1,2 +1,2 @@
Pkg.UserSrc=false
Pkg.Revision=16.0.2
Pkg.Revision=17.0.0