Merge the release branch for v2.5.0

Change-Id: I81b1f178ef9dafa3ab8704967d3f0e926cccb10f
This commit is contained in:
Feng Xiao 2015-03-24 16:53:37 -07:00
commit 775d973254

Diff content is not available