Merge branch 'sr2_upgrade' into develop
authorTaeyoung Son <taeyoung2.son@samsung.com>
Thu, 18 Oct 2012 14:57:48 +0000 (23:57 +0900)
committerTaeyoung Son <taeyoung2.son@samsung.com>
Thu, 18 Oct 2012 14:57:49 +0000 (23:57 +0900)
commita46b98707d407776780ccc83486df3856bbd295b
tree17c396365b7bfc3d7ad70dfb2d77c3a2f9524281
parenteb24cc5fd0863a6ea587389ef0c56fd53edfb1e6
parent9081e5ac635d2a48b79b4a369ee86dd02d0dd6eb
Merge branch 'sr2_upgrade' into develop

Change-ID: I41550bf91528e160b9893ef81aebfb555c3f843f