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)
commit96afa8810f80dd95e85225b0bf410945bfd87a42
tree8e120f1d6b812e557afdf1d9edfe975e5d256ce5
parent2151ae2be74a7d3dfe2d68b930a07f6bb9a31f49
parent71c563573a393c0e856bc2231612fdbe79f36d3e
Merge "test-<1>" into devel