Merge remote-tracking branch 'origin/tizen' into new_text 54/33254/1
authorPaul Wisbey <p.wisbey@samsung.com>
Wed, 7 Jan 2015 10:11:05 +0000 (10:11 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Wed, 7 Jan 2015 10:11:40 +0000 (10:11 +0000)
commit7e713f282f426401e7f7d0a6ccc9f7ebcccfff1c
tree67474847b20e94ffc681f0c0d2be199a0cd8a357
parentf0ea50a46e5de0e9729eef73e3458bb31888575b
parent9d226abd9aa4db50cf2a5466ff97ec11c2dbdff4
Merge remote-tracking branch 'origin/tizen' into new_text

Change-Id: I4cd9e02dda715ea1c7c6bcc19c54de5bd17fdb43
automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h