Merge "GSO-94" into sun
authorTao Shen <shentao@chinamobile.com>
Wed, 2 Nov 2016 09:11:42 +0000 (09:11 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Wed, 2 Nov 2016 09:11:42 +0000 (09:11 +0000)
commit666210acd882d8b7b32908e1b70b5ab5ff0c8fc2
tree155840b37f9b0bc2fd8a252cf32501aae37a7f9d
parentd22723dc36e98fdb50f079d663955dd579ea13ce
parent1c06e2006a67decf4b9a19e85a985e8361ce90e6
Merge "GSO-94" into sun