40 files changed, 189 insertions, 189 deletions
diff --git a/notices/NOTICE.txt b/notices/NOTICE.txt
index b84772b..b07fca8 100644
--- a/notices/NOTICE.txt
+++ b/notices/NOTICE.txt
@@ -219,7 +219,7 @@ IN THE SOFTWARE.
 
 ============================================================
 Notices for file(s):
-manifmerger.jar
+rule-api.jar
 ------------------------------------------------------------
 
    Copyright (c) 2011, The Android Open Source Project
@@ -413,10 +413,43 @@ manifmerger.jar
 
 ============================================================
 Notices for file(s):
-anttasks.jar
+asm-tree-4.0.jar
 ------------------------------------------------------------
 
-   Copyright (c) 2005-2008, The Android Open Source Project
+ ASM: a very small and fast Java bytecode manipulation framework
+ Copyright (c) 2000-2005 INRIA, France Telecom
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holders nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
+
+============================================================
+Notices for file(s):
+lint-checks.jar
+------------------------------------------------------------
+
+   Copyright (c) 2011, The Android Open Source Project
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -607,52 +640,16 @@ anttasks.jar
 
 ============================================================
 Notices for file(s):
-asm-tree-4.0.jar
-------------------------------------------------------------
-
- ASM: a very small and fast Java bytecode manipulation framework
- Copyright (c) 2000-2005 INRIA, France Telecom
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. Neither the name of the copyright holders nor the names of its
-    contributors may be used to endorse or promote products derived from
-    this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- THE POSSIBILITY OF SUCH DAMAGE.
-
-============================================================
-Notices for file(s):
-lint_api.jar
+httpcore-4.1.jar
 ------------------------------------------------------------
+Apache HttpComponents Client
+Copyright 1999-2011 The Apache Software Foundation
 
-   Copyright (c) 2011, The Android Open Source Project
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+This project contains annotations derived from JCIP-ANNOTATIONS
+Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
 
 
                                  Apache License
@@ -831,13 +828,18 @@ lint_api.jar
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
+   
+This project contains annotations derived from JCIP-ANNOTATIONS
+Copyright (c) 2005 Brian Goetz and Tim Peierls.
+See http://www.jcip.net and the Creative Commons Attribution License 
+(http://creativecommons.org/licenses/by/2.5)
 
 ============================================================
 Notices for file(s):
-assetstudio.jar
+sdk-common.jar
 ------------------------------------------------------------
 
-   Copyright (c) 2005-2013, The Android Open Source Project
+   Copyright (c) 2005-2008, The Android Open Source Project
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -1028,7 +1030,7 @@ assetstudio.jar
 
 ============================================================
 Notices for file(s):
-lint_checks.jar
+lint-api.jar
 ------------------------------------------------------------
 
    Copyright (c) 2011, The Android Open Source Project
@@ -1222,7 +1224,7 @@ lint_checks.jar
 
 ============================================================
 Notices for file(s):
-httpcore-4.1.jar
+httpmime-4.1.jar
 ------------------------------------------------------------
 Apache HttpComponents Client
 Copyright 1999-2011 The Apache Software Foundation
@@ -1418,16 +1420,73 @@ See http://www.jcip.net and the Creative Commons Attribution License
 
 ============================================================
 Notices for file(s):
-httpmime-4.1.jar
+jobb.jar
 ------------------------------------------------------------
-Apache HttpComponents Client
-Copyright 1999-2011 The Apache Software Foundation
+Portions of this code:             
+-------------------------------------------------------------------------------
+Copyright (c) 2000 The Legion Of The Bouncy Castle
+(http://www.bouncycastle.org)
 
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the "Software")
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense
+and/or sell copies of the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following conditions:
 
-This project contains annotations derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+-------------------------------------------------------------------------------
+Twofish is uncopyrighted and license-free, and was created and analyzed by:                   
+Bruce Schneier - John Kelsey - Doug Whiting
+David Wagner - Chris Hall - Niels Ferguson
+-------------------------------------------------------------------------------
+Cryptix General License
+
+Copyright (c) 1995-2005 The Cryptix Foundation Limited.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+ 1. Redistributions of source code must retain the copyright notice,
+    this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+-------------------------------------------------------------------------------
+All other code is:
+
+Copyright (C) 2012 The Android Open Source Project 
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at 
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software 
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and 
+limitations under the License.
+
+============================================================
+Notices for file(s):
+dvlib.jar
+------------------------------------------------------------
+
+   Copyright (c) 2005-2013, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
 
                                  Apache License
@@ -1606,72 +1665,13 @@ Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-   
-This project contains annotations derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls.
-See http://www.jcip.net and the Creative Commons Attribution License 
-(http://creativecommons.org/licenses/by/2.5)
-
-============================================================
-Notices for file(s):
-jobb.jar
-------------------------------------------------------------
-Portions of this code:             
--------------------------------------------------------------------------------
-Copyright (c) 2000 The Legion Of The Bouncy Castle
-(http://www.bouncycastle.org)
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the "Software")
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense
-and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
--------------------------------------------------------------------------------
-Twofish is uncopyrighted and license-free, and was created and analyzed by:                   
-Bruce Schneier - John Kelsey - Doug Whiting
-David Wagner - Chris Hall - Niels Ferguson
--------------------------------------------------------------------------------
-Cryptix General License
-
-Copyright (c) 1995-2005 The Cryptix Foundation Limited.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
- 1. Redistributions of source code must retain the copyright notice,
-    this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
--------------------------------------------------------------------------------
-All other code is:
-
-Copyright (C) 2012 The Android Open Source Project 
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at 
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software 
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and 
-limitations under the License.
 
 ============================================================
 Notices for file(s):
-dvlib.jar
+ninepatch.jar
 ------------------------------------------------------------
 
-   Copyright (c) 2005-2013, The Android Open Source Project
+   Copyright (c) 2005-2008, The Android Open Source Project
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -1862,19 +1862,49 @@ dvlib.jar
 
 ============================================================
 Notices for file(s):
-ninepatch.jar
+asm-analysis-4.0.jar
 ------------------------------------------------------------
 
-   Copyright (c) 2005-2008, The Android Open Source Project
+ ASM: a very small and fast Java bytecode manipulation framework
+ Copyright (c) 2000-2005 INRIA, France Telecom
+ All rights reserved.
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holders nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
+
+============================================================
+Notices for file(s):
+commons-logging-1.1.1.jar
+------------------------------------------------------------
+Apache HttpComponents Client
+Copyright 1999-2011 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+This project contains annotations derived from JCIP-ANNOTATIONS
+Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
 
 
                                  Apache License
@@ -2053,52 +2083,27 @@ ninepatch.jar
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
+   
+This project contains annotations derived from JCIP-ANNOTATIONS
+Copyright (c) 2005 Brian Goetz and Tim Peierls.
+See http://www.jcip.net and the Creative Commons Attribution License 
+(http://creativecommons.org/licenses/by/2.5)
 
 ============================================================
 Notices for file(s):
-asm-analysis-4.0.jar
+archquery.jar
 ------------------------------------------------------------
 
- ASM: a very small and fast Java bytecode manipulation framework
- Copyright (c) 2000-2005 INRIA, France Telecom
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. Neither the name of the copyright holders nor the names of its
-    contributors may be used to endorse or promote products derived from
-    this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- THE POSSIBILITY OF SUCH DAMAGE.
-
-============================================================
-Notices for file(s):
-commons-logging-1.1.1.jar
-------------------------------------------------------------
-Apache HttpComponents Client
-Copyright 1999-2011 The Apache Software Foundation
+   Copyright (c) 2005-2008, The Android Open Source Project
 
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
 
-This project contains annotations derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
 
                                  Apache License
@@ -2277,18 +2282,13 @@ Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-   
-This project contains annotations derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls.
-See http://www.jcip.net and the Creative Commons Attribution License 
-(http://creativecommons.org/licenses/by/2.5)
 
 ============================================================
 Notices for file(s):
-archquery.jar
+asset-studio.jar
 ------------------------------------------------------------
 
-   Copyright (c) 2005-2008, The Android Open Source Project
+   Copyright (c) 2005-2013, The Android Open Source Project
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -3279,7 +3279,7 @@ See http://www.jcip.net and the Creative Commons Attribution License
 
 ============================================================
 Notices for file(s):
-sdk_common.jar
+ant-tasks.jar
 ------------------------------------------------------------
 
    Copyright (c) 2005-2008, The Android Open Source Project
@@ -3858,10 +3858,10 @@ asm-4.0.jar
 
 ============================================================
 Notices for file(s):
-layoutlib_api.jar
+manifest-merger.jar
 ------------------------------------------------------------
 
-   Copyright (c) 2005-2008, The Android Open Source Project
+   Copyright (c) 2011, The Android Open Source Project
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -4052,7 +4052,7 @@ layoutlib_api.jar
 
 ============================================================
 Notices for file(s):
-rule_api.jar
+lint.jar
 ------------------------------------------------------------
 
    Copyright (c) 2011, The Android Open Source Project
@@ -4246,10 +4246,10 @@ rule_api.jar
 
 ============================================================
 Notices for file(s):
-lint.jar
+draw9patch.jar
 ------------------------------------------------------------
 
-   Copyright (c) 2011, The Android Open Source Project
+   Copyright (c) 2005-2008, The Android Open Source Project
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -4440,7 +4440,7 @@ lint.jar
 
 ============================================================
 Notices for file(s):
-draw9patch.jar
+layoutlib-api.jar
 ------------------------------------------------------------
 
    Copyright (c) 2005-2008, The Android Open Source Project
diff --git a/notices/base/NOTICE_anttasks.jar.txt b/notices/base/NOTICE_ant-tasks.jar.txt
index e194e04..fd164d8 100644
--- a/notices/base/NOTICE_anttasks.jar.txt
+++ b/notices/base/NOTICE_ant-tasks.jar.txt
@@ -1,6 +1,6 @@
 ============================================================
 Notices for file(s):
-anttasks.jar
+ant-tasks.jar
 ------------------------------------------------------------
 
    Copyright (c) 2005-2008, The Android Open Source Project
diff --git a/notices/base/NOTICE_assetstudio.jar.txt b/notices/base/NOTICE_asset-studio.jar.txt
index 2fd86ca..24d0808 100644
--- a/notices/base/NOTICE_assetstudio.jar.txt
+++ b/notices/base/NOTICE_asset-studio.jar.txt
@@ -1,6 +1,6 @@
 ============================================================
 Notices for file(s):
-assetstudio.jar
+asset-studio.jar
 ------------------------------------------------------------
 
    Copyright (c) 2005-2013, The Android Open Source Project
diff --git a/notices/base/NOTICE_layoutlib_api.jar.txt b/notices/base/NOTICE_layoutlib-api.jar.txt
index 8907416..8e8df4a 100644
--- a/notices/base/NOTICE_layoutlib_api.jar.txt
+++ b/notices/base/NOTICE_layoutlib-api.jar.txt
@@ -1,6 +1,6 @@
 ============================================================
 Notices for file(s):
-layoutlib_api.jar
+layoutlib-api.jar
 ------------------------------------------------------------
 
    Copyright (c) 2005-2008, The Android Open Source Project
diff --git a/notices/base/NOTICE_rule_api.jar.txt b/notices/base/NOTICE_lint-api.jar.txt
index f5704c8..e38a4b1 100644
--- a/notices/base/NOTICE_rule_api.jar.txt
+++ b/notices/base/NOTICE_lint-api.jar.txt
@@ -1,6 +1,6 @@
 ============================================================
 Notices for file(s):
-rule_api.jar
+lint-api.jar
 ------------------------------------------------------------
 
    Copyright (c) 2011, The Android Open Source Project
diff --git a/notices/base/NOTICE_manifmerger.jar.txt b/notices/base/NOTICE_lint-checks.jar.txt
index b78112e..f578992 100644
--- a/notices/base/NOTICE_manifmerger.jar.txt
+++ b/notices/base/NOTICE_lint-checks.jar.txt
@@ -1,6 +1,6 @@
 ============================================================
 Notices for file(s):
-manifmerger.jar
+lint-checks.jar
 ------------------------------------------------------------
 
    Copyright (c) 2011, The Android Open Source Project
diff --git a/notices/base/NOTICE_lint_checks.jar.txt b/notices/base/NOTICE_manifest-merger.jar.txt
index cfc72d8..ed2476e 100644
--- a/notices/base/NOTICE_lint_checks.jar.txt
+++ b/notices/base/NOTICE_manifest-merger.jar.txt
@@ -1,6 +1,6 @@
 ============================================================
 Notices for file(s):
-lint_checks.jar
+manifest-merger.jar
 ------------------------------------------------------------
 
    Copyright (c) 2011, The Android Open Source Project
diff --git a/notices/base/NOTICE_lint_api.jar.txt b/notices/base/NOTICE_rule-api.jar.txt
index d55679c..bfe6649 100644
--- a/notices/base/NOTICE_lint_api.jar.txt
+++ b/notices/base/NOTICE_rule-api.jar.txt
@@ -1,6 +1,6 @@
 ============================================================
 Notices for file(s):
-lint_api.jar
+rule-api.jar
 ------------------------------------------------------------
 
    Copyright (c) 2011, The Android Open Source Project
diff --git a/notices/base/NOTICE_sdk_common.jar.txt b/notices/base/NOTICE_sdk-common.jar.txt
index 1017626..6cd47f0 100644
--- a/notices/base/NOTICE_sdk_common.jar.txt
+++ b/notices/base/NOTICE_sdk-common.jar.txt
@@ -1,6 +1,6 @@
 ============================================================
 Notices for file(s):
-sdk_common.jar
+sdk-common.jar
 ------------------------------------------------------------
 
    Copyright (c) 2005-2008, The Android Open Source Project
diff --git a/tools/android.bat b/tools/android.bat
index 222ea88..f6cfa00 100755
--- a/tools/android.bat
+++ b/tools/android.bat
@@ -57,7 +57,7 @@ for /f %%a in ('%java_exe% -jar lib\archquery.jar') do set swt_path=lib\%%a
     copy /B /D /Y lib\httpclient*        %tmp_dir%\lib\        > nul
     copy /B /D /Y lib\httpcore*          %tmp_dir%\lib\        > nul
     copy /B /D /Y lib\httpmime*          %tmp_dir%\lib\        > nul
-    copy /B /D /Y lib\layoutlib_api.jar  %tmp_dir%\lib\        > nul
+    copy /B /D /Y lib\layoutlib-api.jar  %tmp_dir%\lib\        > nul
     copy /B /D /Y lib\org.eclipse.*      %tmp_dir%\lib\        > nul
     copy /B /D /Y lib\sdk*               %tmp_dir%\lib\        > nul
     copy /B /D /Y lib\swtmenubar.jar     %tmp_dir%\lib\        > nul
diff --git a/tools/lib/ant-tasks.jar b/tools/lib/ant-tasks.jar
index e01a8e9..759ec0e 100644
--- a/tools/lib/ant-tasks.jar
+++ b/tools/lib/ant-tasks.jar
diff --git a/tools/lib/archquery.jar b/tools/lib/archquery.jar
index 25d352b..f3554ee 100644
--- a/tools/lib/archquery.jar
+++ b/tools/lib/archquery.jar
diff --git a/tools/lib/assetstudio.jar b/tools/lib/asset-studio.jar
index 99084ee..6d4860a 100644
--- a/tools/lib/assetstudio.jar
+++ b/tools/lib/asset-studio.jar
diff --git a/tools/lib/chimpchat.jar b/tools/lib/chimpchat.jar
index 4dc83eb..3231a0b 100644
--- a/tools/lib/chimpchat.jar
+++ b/tools/lib/chimpchat.jar
diff --git a/tools/lib/common.jar b/tools/lib/common.jar
index aa447a9..ff99af6 100644
--- a/tools/lib/common.jar
+++ b/tools/lib/common.jar
diff --git a/tools/lib/ddmlib.jar b/tools/lib/ddmlib.jar
index f9b0ece..3707689 100644
--- a/tools/lib/ddmlib.jar
+++ b/tools/lib/ddmlib.jar
diff --git a/tools/lib/ddms.jar b/tools/lib/ddms.jar
index 22dc992..5b544a7 100644
--- a/tools/lib/ddms.jar
+++ b/tools/lib/ddms.jar
diff --git a/tools/lib/ddmuilib.jar b/tools/lib/ddmuilib.jar
index 62e5bac..de4211b 100644
--- a/tools/lib/ddmuilib.jar
+++ b/tools/lib/ddmuilib.jar
diff --git a/tools/lib/draw9patch.jar b/tools/lib/draw9patch.jar
index 582a25e..5b9f96a 100644
--- a/tools/lib/draw9patch.jar
+++ b/tools/lib/draw9patch.jar
diff --git a/tools/lib/dvlib.jar b/tools/lib/dvlib.jar
index 12ba164..d0939ff 100644
--- a/tools/lib/dvlib.jar
+++ b/tools/lib/dvlib.jar
diff --git a/tools/lib/fat32lib.jar b/tools/lib/fat32lib.jar
index 42093a6..47facbb 100644
--- a/tools/lib/fat32lib.jar
+++ b/tools/lib/fat32lib.jar
diff --git a/tools/lib/hierarchyviewer2.jar b/tools/lib/hierarchyviewer2.jar
index c920410..4464132 100644
--- a/tools/lib/hierarchyviewer2.jar
+++ b/tools/lib/hierarchyviewer2.jar
diff --git a/tools/lib/hierarchyviewer2lib.jar b/tools/lib/hierarchyviewer2lib.jar
index 5cabafd..4381406 100644
--- a/tools/lib/hierarchyviewer2lib.jar
+++ b/tools/lib/hierarchyviewer2lib.jar
diff --git a/tools/lib/jobb.jar b/tools/lib/jobb.jar
index 9812bb1..76f30f5 100644
--- a/tools/lib/jobb.jar
+++ b/tools/lib/jobb.jar
diff --git a/tools/lib/layoutlib_api.jar b/tools/lib/layoutlib-api.jar
index 8c1df92..2b72174 100644
--- a/tools/lib/layoutlib_api.jar
+++ b/tools/lib/layoutlib-api.jar
diff --git a/tools/lib/lint_api.jar b/tools/lib/lint-api.jar
index a2a4cab..8ed5da8 100644
--- a/tools/lib/lint_api.jar
+++ b/tools/lib/lint-api.jar
diff --git a/tools/lib/lint_checks.jar b/tools/lib/lint-checks.jar
index 38b017c..9afc123 100644
--- a/tools/lib/lint_checks.jar
+++ b/tools/lib/lint-checks.jar
diff --git a/tools/lib/lint.jar b/tools/lib/lint.jar
index 822dfce..1069f9f 100644
--- a/tools/lib/lint.jar
+++ b/tools/lib/lint.jar
diff --git a/tools/lib/manifmerger.jar b/tools/lib/manifest-merger.jar
index 26a6ef8..5998a4c 100644
--- a/tools/lib/manifmerger.jar
+++ b/tools/lib/manifest-merger.jar
diff --git a/tools/lib/monkeyrunner.jar b/tools/lib/monkeyrunner.jar
index 1104e3e..a1ea592 100644
--- a/tools/lib/monkeyrunner.jar
+++ b/tools/lib/monkeyrunner.jar
diff --git a/tools/lib/ninepatch.jar b/tools/lib/ninepatch.jar
index f324322..8ced24b 100644
--- a/tools/lib/ninepatch.jar
+++ b/tools/lib/ninepatch.jar
diff --git a/tools/lib/rule_api.jar b/tools/lib/rule-api.jar
index efe9b92..8cb0e36 100644
--- a/tools/lib/rule_api.jar
+++ b/tools/lib/rule-api.jar
diff --git a/tools/lib/sdk_common.jar b/tools/lib/sdk-common.jar
index 89c3b38..b910bae 100644
--- a/tools/lib/sdk_common.jar
+++ b/tools/lib/sdk-common.jar
diff --git a/tools/lib/sdklib.jar b/tools/lib/sdklib.jar
index e76a9d0..1b9ddf9 100644
--- a/tools/lib/sdklib.jar
+++ b/tools/lib/sdklib.jar
diff --git a/tools/lib/sdkmanager.jar b/tools/lib/sdkmanager.jar
index aa05fe4..ba4fda8 100644
--- a/tools/lib/sdkmanager.jar
+++ b/tools/lib/sdkmanager.jar
diff --git a/tools/lib/sdkstats.jar b/tools/lib/sdkstats.jar
index 08281d4..d81512d 100644
--- a/tools/lib/sdkstats.jar
+++ b/tools/lib/sdkstats.jar
diff --git a/tools/lib/sdkuilib.jar b/tools/lib/sdkuilib.jar
index e626c1d..c126861 100644
--- a/tools/lib/sdkuilib.jar
+++ b/tools/lib/sdkuilib.jar
diff --git a/tools/lib/swtmenubar.jar b/tools/lib/swtmenubar.jar
index 3a31196..c56c217 100644
--- a/tools/lib/swtmenubar.jar
+++ b/tools/lib/swtmenubar.jar
diff --git a/tools/lib/traceview.jar b/tools/lib/traceview.jar
index 1e9640d..1b43100 100644
--- a/tools/lib/traceview.jar
+++ b/tools/lib/traceview.jar
diff --git a/tools/lib/uiautomatorviewer.jar b/tools/lib/uiautomatorviewer.jar
index 8522e42..79d29ec 100644
--- a/tools/lib/uiautomatorviewer.jar
+++ b/tools/lib/uiautomatorviewer.jar