Merge branch 'upstream' into tizen 27/25927/1
authorImran Zaman <imran.zaman@intel.com>
Tue, 12 Aug 2014 13:47:48 +0000 (16:47 +0300)
committerImran Zaman <imran.zaman@intel.com>
Tue, 12 Aug 2014 13:48:00 +0000 (16:48 +0300)
commitc9dde7c342c002e8a5f55e07ccecfb5dccf8882c
tree5a1d56ac5fbe6881c2a0c2972ec89f7c32bc7a2b
parent055ce375c1a6f203d635f1c18282a5646a844ca8
parenta16c093f362517e45edd8e6638c76d0cb074d11c
Merge branch 'upstream' into tizen

Change-Id: Id6bcc0fdbd05161e388b23a5a6c5975e4f9dda18
Signed-off-by: Imran Zaman <imran.zaman@intel.com>