Merge branch 'upstream' into tizen 39/23939/1 accepted/tizen/common/20140722.142853 submit/tizen/20140704.131349
authorImran Zaman <imran.zaman@intel.com>
Fri, 4 Jul 2014 13:12:15 +0000 (16:12 +0300)
committerImran Zaman <imran.zaman@intel.com>
Fri, 4 Jul 2014 13:12:28 +0000 (16:12 +0300)
commit3b020093ac6bcc6ef4ccd8a9ecd6286f136f26d6
tree49ed4213d7d8a62962efb4976f04f81fdbc3c70f
parent34cf061360a6bc96e56fb355522ba9eb436755df
parent031ece5a7b5fc4a14a6577759b2c53716873510a
Merge branch 'upstream' into tizen

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