Merge branch 'w/prod/rinato/sdk'
authorSungyeon Woo <s.woo@samsung.com>
Mon, 11 Aug 2014 09:23:36 +0000 (18:23 +0900)
committerSungyeon Woo <s.woo@samsung.com>
Mon, 11 Aug 2014 09:24:37 +0000 (18:24 +0900)
Change-Id: Ic865b9d7a1ca1a4268bb271d98f866e766acf34d


Trivial merge