Merge "[SSM] Fix scons android build failure"
authorUze Choi <uzchoi@samsung.com>
Wed, 24 Dec 2014 02:57:02 +0000 (02:57 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Wed, 24 Dec 2014 02:57:03 +0000 (02:57 +0000)

Trivial merge