Merge "test-<1>" into devel
authorRong Jinhui <jinhui.rong@samsung.com>
Thu, 9 Jul 2015 21:00:24 +0000 (05:00 +0800)
committerGerrit Code Review <root@liupp-HP-Compaq-Pro-6380-MT>
Thu, 9 Jul 2015 21:00:24 +0000 (05:00 +0800)

Trivial merge