[android-platform-tools-base] 29/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 7ead3ab4bb51b7ef25d72da9be6e61e50a0903cf
Merge: 3c02d19 338d66a
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Fri Jul 22 17:39:57 2016 +0800

    Merge tag 'upstream/2.0.0'
    
    Upstream version 2.0.0
    
    # gpg: Signature made 2016年07月22日 (週五) 17時39分57秒 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

 .../resources/testData/packaging/images/lena.png   |  Bin 473831 -> 0 bytes
 .../testData/packaging/text-files/rfc2460.txt      | 2187 --------------------
 2 files changed, 2187 deletions(-)

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