diff options
| author | Raphael Moll <raphael@google.com> | 2013-03-22 13:05:32 -0700 |
|---|---|---|
| committer | Raphael Moll <raphael@google.com> | 2013-03-22 13:05:32 -0700 |
| commit | a7a51a397e3500b91649bb5a46e7169865151515 (patch) | |
| tree | 5341036fea1ea8982f7423407b75369b08695fa8 /sdk | |
| parent | 11ad495f11f17a1f2912e0c9e4b915ae5ad6cce9 (diff) | |
| parent | 9583d2ed3ae085ad38dd78167878ed00becb387a (diff) | |
| download | android_development-a7a51a397e3500b91649bb5a46e7169865151515.tar.gz android_development-a7a51a397e3500b91649bb5a46e7169865151515.tar.bz2 android_development-a7a51a397e3500b91649bb5a46e7169865151515.zip | |
resolved conflicts for merge of 9583d2ed to jb-mr2-dev
Change-Id: Ib6c5f18a2b6429ef8bbca577e8cabcab26dc6ca1
Diffstat (limited to 'sdk')
| -rw-r--r-- | sdk/build_tools_source.properties | 3 | ||||
| -rw-r--r-- | sdk/plat_tools_source.properties | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sdk/build_tools_source.properties b/sdk/build_tools_source.properties new file mode 100644 index 000000000..3aa7a9571 --- /dev/null +++ b/sdk/build_tools_source.properties @@ -0,0 +1,3 @@ +Pkg.UserSrc=false +Pkg.Revision=17.0.0 + diff --git a/sdk/plat_tools_source.properties b/sdk/plat_tools_source.properties index 37153b533..a8edff084 100644 --- a/sdk/plat_tools_source.properties +++ b/sdk/plat_tools_source.properties @@ -1,2 +1,2 @@ Pkg.UserSrc=false -Pkg.Revision=16.0.2
\ No newline at end of file +Pkg.Revision=17.0.0 |