Merge "Fix the problem "when upload package throws an exception "String index out...
authorsun qi <sun.qi310@zte.com.cn>
Thu, 13 Oct 2016 06:43:34 +0000 (06:43 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Thu, 13 Oct 2016 06:43:34 +0000 (06:43 +0000)

Trivial merge