Merge the release branch for v2.5.0

Change-Id: I81b1f178ef9dafa3ab8704967d3f0e926cccb10f
pull/256/merge
Feng Xiao 10 years ago
commit 775d973254

Diff Content Not Available