[android-platform-tools-base] 09/30: Merge tag 'upstream/2.0.0'

[Kai-Chung Yan]

This is an automated email from the git hooks/post-receive script.

seamlik-guest pushed a commit to branch master
in repository android-platform-tools-base.

commit 92dba9fc7912247c6280122551a9403151c27b17
Merge: d4165d1 41249cc
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Thu Jul 21 15:19:21 2016 +0800

    Merge tag 'upstream/2.0.0'
    
    Upstream version 2.0.0
    
    # gpg: Signature made 2016年07月21日 (週四) 15時19分21秒 CST using RSA key ID 37FE9825
    # gpg: Good signature from "Kai-Chung Yan (seamlik) <seamlikok at gmail.com>" [unknown]
    # gpg:                 aka "QICONG YIN (Passport English) <seamlikok at gmail.com>" [unknown]
    # gpg:                 aka "殷启聪 (Simplified Chinese) <seamlikok at gmail.com>" [unknown]
    # gpg:                 aka "殷啟聰 (Traditional Chinese) <seamlikok at gmail.com>" [unknown]
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: B88A 153A DD3D 973F 3B1F  F79A DD1F AB89 37FE 9825

 .eclipse/dictionary.txt                            | 407 +++++++++++++++++++++
 .gitignore                                         |  17 +
 .idea/.name                                        |   1 +
 .idea/ant.xml                                      |   3 +
 .../com/google/common/base/annotations.xml         |   7 +
 .../com/google/common/truth/annotations.xml        |   7 +
 .idea/codeInsightSettings.xml                      |  13 +
 .idea/codeStyleSettings.xml                        | 152 ++++++++
 .idea/compiler.xml                                 |  28 ++
 .idea/copyright/aosp.xml                           |   9 +
 .idea/copyright/profiles_settings.xml              |   7 +
 .idea/dictionaries/adt.xml                         | 321 ++++++++++++++++
 .idea/encodings.xml                                |   6 +
 .idea/gradle.xml                                   |   3 +
 .idea/inspectionProfiles/Project_Default.xml       | 220 +++++++++++
 .idea/inspectionProfiles/profiles_settings.xml     |   7 +
 .idea/libraries/JUnit3.xml                         |   9 +
 .idea/libraries/JUnit4.xml                         |  13 +
 .idea/libraries/Trove4j.xml                        |  12 +
 .idea/libraries/android.xml                        |  10 +
 .idea/libraries/ant.xml                            |   9 +
 .idea/libraries/antlr.xml                          |   9 +
 .idea/libraries/asm_tools.xml                      |  15 +
 .idea/libraries/bouncy_castle.xml                  |  13 +
 .idea/libraries/builder_model.xml                  |  11 +
 .idea/libraries/commons_compress.xml               |  11 +
 .idea/libraries/easymock_tools.xml                 |  16 +
 .idea/libraries/ecj.xml                            |  11 +
 .idea/libraries/gradle_tooling_api.xml             |  11 +
 .idea/libraries/groovy.xml                         |   9 +
 .idea/libraries/gson.xml                           |  11 +
 .idea/libraries/guava_tools.xml                    |  14 +
 .idea/libraries/http_client.xml                    |  19 +
 .idea/libraries/icu4j.xml                          |  11 +
 .idea/libraries/intellij_annotations.xml           |  11 +
 .idea/libraries/jacoco.xml                         |  11 +
 .idea/libraries/javawriter.xml                     |  11 +
 .idea/libraries/jsr_305.xml                        |  11 +
 .idea/libraries/kxml2.xml                          |  11 +
 .idea/libraries/lombok_ast.xml                     |  14 +
 .idea/libraries/mockito.xml                        |  12 +
 .idea/libraries/proguard_gradle.xml                |  13 +
 .idea/libraries/slf4j_api.xml                      |  11 +
 .idea/libraries/slf4j_simple.xml                   |  11 +
 .idea/libraries/truth.xml                          |  14 +
 .idea/libraries/xjc.xml                            |  32 ++
 .idea/misc.xml                                     |  57 +++
 .idea/modules.xml                                  |  52 +++
 .idea/projectCodeStyle.xml                         | 135 +++++++
 .idea/scopes/custom_scope.xml                      |   3 +
 .idea/scopes/scope_settings.xml                    |   5 +
 .idea/uiDesigner.xml                               | 125 +++++++
 .idea/vcs.xml                                      |   7 +
 53 files changed, 1968 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/android-platform-tools-base.git