tree c488e5c657ba88d35d89f94def89a5a4cdd9951b
parent 0c15a90a1766170eea8a994cff684fa4746acf4c
parent 940031fc4c897e5719902a84e0d9f819eb7ec8f8
author jin xin <j00101220@huawei.com> 1477290307 +0000
committer Gerrit Code Review <gerrit@open-o.org> 1477290307 +0000

Merge "Issue ID:GSO-43"