From: Peng Li <seudut@gmail.com>
Date: Wed, 30 May 2018 04:07:32 +0000 (+0800)
Subject: Merge branch 'dev'
X-Git-Tag: v0.3.4~1
X-Git-Url: http://47.100.26.94:8080/?a=commitdiff_plain;h=e7738ebb34a134ae69868998fe6b0d5ff0df01f6;hp=e7738ebb34a134ae69868998fe6b0d5ff0df01f6;p=rtmpclient.git

Merge branch 'dev'
1. Add keystore for update
2. Rename package
---