sooyeon.kim [Mon, 23 Oct 2017 11:26:08 +0000 (20:26 +0900)]
Fix STT/TTS guides (Coding Convention)
Change-Id: Icd62007e8b322fadd74d5a1c25d14eda10520e29
Signed-off-by: sooyeon.kim <sooyeon.kim@samsung.com>
Mijin Cho [Wed, 25 Oct 2017 05:11:55 +0000 (05:11 +0000)]
Merge "UI BUILDER: Update document and screenshot for the new UI/UX" into tizen
Mijin Cho [Wed, 25 Oct 2017 05:10:28 +0000 (05:10 +0000)]
Merge "Fix example code error" into tizen
hj kim [Tue, 24 Oct 2017 01:19:52 +0000 (10:19 +0900)]
Fix example code error
PS2: Reviewed
Change-Id: I15510f84e22cea80498fd1dec044d85a37cf2cfe
Semun Lee [Sun, 22 Oct 2017 23:53:39 +0000 (08:53 +0900)]
Add description of package id and app id restriction
PS3: Reviewed
Change-Id: If302bc0fdad8e7db01bae41329429a03ae3b96bf
Signed-off-by: Semun Lee <semun.lee@samsung.com>
sonbc121.son [Fri, 20 Oct 2017 06:43:55 +0000 (15:43 +0900)]
UI BUILDER: Update document and screenshot for the new UI/UX
PS2: Reviewed
Change-Id: Iffaa72ddb4147d91c632e75de8ed84d692d7d6db
Signed-off-by: sonbc121.son <sonbc121.son@samsung.com>
Mijin Cho [Tue, 24 Oct 2017 01:04:53 +0000 (01:04 +0000)]
Merge "Add TEF module version" into tizen
Pawel Wasowski [Mon, 23 Oct 2017 10:43:31 +0000 (12:43 +0200)]
[Web API][Sensor] Fix feature descriptions for HRM_RAW sensor
Change-Id: Id2ff5766c11887c58de78acfab6cec7b9bfbcd52
Signed-off-by: Pawel Wasowski <p.wasowski2@partner.samsung.com>
Krzysztof Dynowski [Mon, 23 Oct 2017 10:30:38 +0000 (12:30 +0200)]
Add TEF module version
Change-Id: Iae82ef44776d52251befb3730e7131742aab8383
Mijin Cho [Mon, 23 Oct 2017 08:18:00 +0000 (08:18 +0000)]
Merge "[metadata-extractor][ACR-1043] Update document" into tizen
Minje Ahn [Fri, 20 Oct 2017 06:52:10 +0000 (15:52 +0900)]
[metadata-extractor][ACR-1043] Update document
Change-Id: I7655b040a0b6d17eebf51804d3d36e85b94ba9f3
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
Hyunjin [Fri, 20 Oct 2017 06:13:13 +0000 (15:13 +0900)]
[Web device API] add input.key.xx features for TWDAPI-160
Change-Id: I5a4829eef8b973a7abfdf1ccec0e9c4ace987a87
Mijin Cho [Fri, 20 Oct 2017 05:18:38 +0000 (05:18 +0000)]
Merge "[CLI] Update CLI contents" into tizen
Mijin Cho [Fri, 20 Oct 2017 05:17:21 +0000 (05:17 +0000)]
Merge "UIB-Convert: Update UI Builder converting for new GUI" into tizen
sonbc121.son [Thu, 19 Oct 2017 04:59:11 +0000 (13:59 +0900)]
UIB-Convert: Update UI Builder converting for new GUI
Changed the name inside the tool (Storyboard tab -> Storyboard).
Because the Storyboard function is absorbed into the Design Editor.
Change-Id: I036483d00d2a83bb6efd917982f8df29fad41dfc
Signed-off-by: sonbc121.son <sonbc121.son@samsung.com>
SangJin Kim [Thu, 19 Oct 2017 05:20:07 +0000 (14:20 +0900)]
[CLI] Update CLI contents
- Update 'package' command for active signing profile.
- Update 'list'/'build-native' command for add-on framework feature.
- Add 'trust-anchor' command.
Change-Id: Ib162a24d229fbfb54df867f8237b7ccb25e956f6
Signed-off-by: SangJin Kim <sangjin3.kim@samsung.com>
gyeongmin.ju [Wed, 18 Oct 2017 08:52:25 +0000 (17:52 +0900)]
DOC: modify TizenRT online-doc
PS2: Reviewed
PS3: Implemented query response
Change-Id: I6d490d45e6dedc541a55df9882e984688b19020d
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Youngae Kang [Fri, 20 Oct 2017 02:41:23 +0000 (02:41 +0000)]
Merge "Fix code snippet" into tizen
Mijin Cho [Fri, 20 Oct 2017 02:19:57 +0000 (02:19 +0000)]
Merge "Change class name and some values" into tizen
Mijin Cho [Fri, 20 Oct 2017 00:43:28 +0000 (00:43 +0000)]
Merge "Add new description for "Trust-anchor" feature into Tizen." into tizen
taesub kim [Thu, 19 Oct 2017 23:01:24 +0000 (08:01 +0900)]
Fix code snippet
Change-Id: I20a74870616de030f18b8c46e177c31201c4bb9d
Signed-off-by: Taesub Kim <taesub.kim@samsung.com>
chleun.moon [Thu, 19 Oct 2017 10:27:12 +0000 (19:27 +0900)]
[C#][Connection] Fix EventArgs
Change-Id: I80a6e0a0bc67d2fe441e14ca198a4d3af20b271e
Signed-off-by: Cheoleun Moon <chleun.moon@samsung.com>
Haesu Gwon [Thu, 19 Oct 2017 09:26:53 +0000 (18:26 +0900)]
Change class name and some values
PS2: Reviewed
Change-Id: I8198303df2218729a40b99cde01bb71e7d478798
Signed-off-by: Haesu Gwon <haesu.gwon@samsung.com>
Mijin Cho [Thu, 19 Oct 2017 01:15:24 +0000 (01:15 +0000)]
Merge "Add C# Application Manager API Guide" into tizen
Mijin Cho [Thu, 19 Oct 2017 01:13:46 +0000 (01:13 +0000)]
Merge "Add C# WatchApplication API Guide" into tizen
Mijin Cho [Thu, 19 Oct 2017 01:00:41 +0000 (01:00 +0000)]
Merge "Create a new .Net CLI User's Guide document." into tizen
Mijin Cho [Thu, 19 Oct 2017 00:19:34 +0000 (00:19 +0000)]
Merge "Fix code snippets in .NET Attached Devices guide" into tizen
Youngae Kang [Wed, 18 Oct 2017 10:57:08 +0000 (10:57 +0000)]
Merge "Add download feature key name" into tizen
Mijin Cho [Wed, 18 Oct 2017 09:50:50 +0000 (09:50 +0000)]
Merge "Unmerge table cells in Guides" into tizen
sujin921.kim [Wed, 18 Oct 2017 09:12:43 +0000 (18:12 +0900)]
Add new description for "Trust-anchor" feature into Tizen.
PS3: Reviewed
Change-Id: I50d4e2ce93189be1e0f0c2c49682761f23bbf5a9
taesub kim [Wed, 18 Oct 2017 07:57:12 +0000 (16:57 +0900)]
Add download feature key name
Change-Id: Ibde685d37029d78d5f35a9557c4e8001dbc4a125
Signed-off-by: Taesub Kim <taesub.kim@samsung.com>
Hwankyu Jhun [Wed, 18 Oct 2017 00:21:20 +0000 (09:21 +0900)]
Add C# Application Manager API Guide
PS3: Reviewed
Change-Id: Ib3770d0a8f5693c9a734c0da31516072d41f2e7b
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
SukHyung, Kang [Tue, 17 Oct 2017 06:48:59 +0000 (15:48 +0900)]
Add C# WatchApplication API Guide
PS3: Reviewed
Change-Id: I35a6aad5cad8e2f05fb5ea4557e98913d7e1f18f
Signed-off-by: SukHyung, Kang <shine.kang@samsung.com>
Mijin Cho [Wed, 18 Oct 2017 07:14:46 +0000 (07:14 +0000)]
Merge "Added formattable guide" into tizen
Mijin Cho [Wed, 18 Oct 2017 06:27:24 +0000 (06:27 +0000)]
Merge "Fix links to EFL Elementary APIs" into tizen
Editor Lionbridge [Tue, 17 Oct 2017 12:47:38 +0000 (15:47 +0300)]
Unmerge table cells in Guides
This is a manual cherry pick from change #149822 in the tizen_3.0
branch.
It synchs table information with tizen_3.0, and also unmerges table
cells in .NET guides.
Change-Id: I36afd0d091abbd82b07079aa749bd44889a06248
Lukasz Pik [Mon, 16 Oct 2017 14:24:03 +0000 (16:24 +0200)]
Added formattable guide
PS2: Reviewed
PS3: Rebase
Change-Id: Ifc0d194bd4bbd6d2799010afd632904d790b835a
Signed-off-by: Lukasz Pik <lu.pik@samsung.com>
Mijin Cho [Tue, 17 Oct 2017 10:04:47 +0000 (10:04 +0000)]
Merge "[ACR-661] Added measure guides" into tizen
Editor Lionbridge [Tue, 17 Oct 2017 09:27:03 +0000 (12:27 +0300)]
Fix links to EFL Elementary APIs
This is a manual cherry-pick from the #126853 change in the tizen_3.0
branch.
Change-Id: I5df45de60ff9fe82b57774d703ffd4efb4d68ee3
Lukasz Pik [Mon, 16 Oct 2017 17:06:56 +0000 (19:06 +0200)]
[ACR-661] Added measure guides
PS2: Reviewed
Change-Id: Ie5b2b10134c0d451b6d9f0352bc2dbd007a6fa91
Signed-off-by: Lukasz Pik <lu.pik@samsung.com>
Sujin Lee [Thu, 12 Oct 2017 06:03:04 +0000 (15:03 +0900)]
Create a new .Net CLI User's Guide document.
PS2: Reviewed
PS3: Query answers implemented
PS4: New topic added to index files and linked from parent topic
PS5: Rebase
Change-Id: I9446bf54d2366c12540c16029a9772a823d5540e
Signed-off-by: Sujin Lee <lee.sujin@samsung.com>
Mijin Cho [Tue, 17 Oct 2017 07:05:32 +0000 (07:05 +0000)]
Merge "Update 4.0-specific native Guide content" into tizen
Mijin Cho [Tue, 17 Oct 2017 07:03:26 +0000 (07:03 +0000)]
Merge "Update Web Guide content" into tizen
Mijin Cho [Tue, 17 Oct 2017 06:50:56 +0000 (06:50 +0000)]
Merge "[ACR-1023] Add new description for significant motion sensor" into tizen
kibak.yoon [Thu, 12 Oct 2017 14:10:06 +0000 (23:10 +0900)]
[ACR-1023] Add new description for significant motion sensor
PS2: Reviewed
PS3: Added missing html tag
PS5: Reviewed again
PS6: Restored some missed edits
Change-Id: I1e6438ced319075bf4c89781f2444789548f1875
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>
Mijin Cho [Tue, 17 Oct 2017 01:09:04 +0000 (01:09 +0000)]
Merge "Edit TV profile addition change" into tizen
Editor Lionbridge [Wed, 12 Jul 2017 06:08:01 +0000 (09:08 +0300)]
Edit TV profile addition change
This is a manual cherry pick of change #126874 in the tizen_3.0
branch.
PS2: Removed mention of geolocation API for TV (which is not supported).
PS3: Removed unused table column.
PS4: Fixed links to TV W3C AR.
PS5: Rebased
PS6: Removed internet privilege for TV, per query answer.
Change-Id: I2b2c8a0435587ab458e372ecd807f344aed61929
Editor Lionbridge [Mon, 16 Oct 2017 10:54:01 +0000 (13:54 +0300)]
Update Web Guide content
This is a manual cherry-pick from change #150428 in the tizen_3.0
branch.
Change-Id: Id419b0f1d1874942951ac6b8452fc35ecd698344
Mijin Cho [Mon, 16 Oct 2017 08:39:19 +0000 (08:39 +0000)]
Merge "Added UTM scale guides" into tizen
Lukasz Pik [Fri, 6 Oct 2017 12:06:34 +0000 (14:06 +0200)]
Added UTM scale guides
PS2: Reviewed
PS3: Rebased
Change-Id: I47ba29d4d9c397147ad12d7105df810b45cf4a04
Signed-off-by: Lukasz Pik <lu.pik@samsung.com>
Seungha Son [Sun, 15 Oct 2017 23:31:19 +0000 (08:31 +0900)]
Add badge feature key name
Signed-off-by: Seungha Son <seungha.son@samsung.com>
Change-Id: I6748b6e6edbe4eced341ebd100c045add5fcc0f7
Mijin Cho [Mon, 16 Oct 2017 06:08:26 +0000 (06:08 +0000)]
Merge "Add shortcut feature key name" into tizen
Mijin Cho [Mon, 16 Oct 2017 06:07:04 +0000 (06:07 +0000)]
Merge "Add minicontrol feature key name" into tizen
Mijin Cho [Mon, 16 Oct 2017 06:04:09 +0000 (06:04 +0000)]
Merge "Add watch_app feature detail" into tizen
Mijin Cho [Mon, 16 Oct 2017 06:02:30 +0000 (06:02 +0000)]
Merge "[TWDAPI-172] Web TEF API (GlobalPlaform) documentation." into tizen
Mijin Cho [Mon, 16 Oct 2017 05:52:44 +0000 (05:52 +0000)]
Merge "[Application] Updating getBatteryUsageInfo() and getAppsUsageInfo() methods" into tizen
Mijin Cho [Mon, 16 Oct 2017 04:46:23 +0000 (04:46 +0000)]
Merge "Add Device Manager to Studio" into tizen
Mijin Cho [Mon, 16 Oct 2017 04:32:29 +0000 (04:32 +0000)]
Merge "Apply newly released Log View and Remove Connection Explorer View." into tizen
Mijin Cho [Mon, 16 Oct 2017 02:15:32 +0000 (02:15 +0000)]
Merge "Added field position guides" into tizen
Mijin Cho [Mon, 16 Oct 2017 02:13:59 +0000 (02:13 +0000)]
Merge "[Multimedia] Add guide for the MediaCodec" into tizen
Mijin Cho [Mon, 16 Oct 2017 02:11:42 +0000 (02:11 +0000)]
Merge "Add Tizen .NET API Guide for Tizen.Uix.InputMethod" into tizen
Seungha Son [Sun, 15 Oct 2017 23:47:15 +0000 (08:47 +0900)]
Add shortcut feature key name
Signed-off-by: Seungha Son <seungha.son@samsung.com>
Change-Id: Ie3743b4fc3be7a96298a8dbbc2bb2026aba23ba6
Seungha Son [Sun, 15 Oct 2017 23:40:53 +0000 (08:40 +0900)]
Add minicontrol feature key name
Signed-off-by: Seungha Son <seungha.son@samsung.com>
Change-Id: I9df95c1d30f3635653ca2d2579a80d7e012d318e
Youngae Kang [Fri, 13 Oct 2017 08:55:58 +0000 (08:55 +0000)]
Merge "[media-content][ACR-1098] Remove deprecated API from sample code" into tizen
Youngae Kang [Fri, 13 Oct 2017 08:52:46 +0000 (08:52 +0000)]
Merge "Add guide for application_icon" into tizen
SukHyung, Kang [Fri, 13 Oct 2017 01:57:19 +0000 (10:57 +0900)]
Add watch_app feature detail
PS2: Reviewed
PS3: Added missing html tag.
Change-Id: Iadeda0b5da9e9c4a471996274c0222b03ca21e88
Signed-off-by: SukHyung, Kang <shine.kang@samsung.com>
Mijin Cho [Fri, 13 Oct 2017 06:18:06 +0000 (06:18 +0000)]
Merge "Add guide document for DataControl of dotnet" into tizen
Myungki Lee [Fri, 29 Sep 2017 08:25:23 +0000 (17:25 +0900)]
Add guide for application_icon
- c# document
PS2: Reviewed
PS3: Applied changes as per query answers.
Change-Id: I5af29a384d1dce0ea24043e4b49f3fbb5bdc3948
Signed-off-by: Myungki Lee <mk5004.lee@samsung.com>
Lukasz Pik [Tue, 3 Oct 2017 10:52:28 +0000 (12:52 +0200)]
Added field position guides
PS2: Reviewed
PS3: Fixed missing words and a typo
PS4: Rebase
Change-Id: I7fe2a19d4b6b89d76dea61eb997daeb9c751b5fc
Signed-off-by: Lukasz Pik <lu.pik@samsung.com>
Mijin Cho [Fri, 13 Oct 2017 05:06:54 +0000 (05:06 +0000)]
Merge "Added format module guide" into tizen
Mijin Cho [Fri, 13 Oct 2017 04:42:19 +0000 (04:42 +0000)]
Merge "Add Known issue, UI Builder does not open layout.xml file" into tizen
Mijin Cho [Fri, 13 Oct 2017 04:38:08 +0000 (04:38 +0000)]
Merge "[Multimedia] Add guide for the AudioManager" into tizen
Mijin Cho [Fri, 13 Oct 2017 04:34:11 +0000 (04:34 +0000)]
Merge "[Multimedia] Add guide for the screen mirroring" into tizen
Mijin Cho [Fri, 13 Oct 2017 04:30:37 +0000 (04:30 +0000)]
Merge "[Multimedia] Add guide for playback" into tizen
Mijin Cho [Fri, 13 Oct 2017 02:19:36 +0000 (02:19 +0000)]
Merge "[Multimedia] Add guide for the AudioIO" into tizen
Minje Ahn [Thu, 12 Oct 2017 08:12:35 +0000 (17:12 +0900)]
[media-content][ACR-1098] Remove deprecated API from sample code
Change-Id: I12965529137ce92f5af1eac92038cc728d6f2229
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
Mijin Cho [Thu, 12 Oct 2017 04:55:34 +0000 (04:55 +0000)]
Merge "Implement full content edit for preview" into tizen
Editor Lionbridge [Tue, 18 Jul 2017 11:12:53 +0000 (14:12 +0300)]
Add Device Manager to Studio
New Device Manager topic, common to both native and Web,
has been added to the Studio section.
PS3: Edited new install and permission sections.
PS4: Modified release version to 2.0 at line 27.
Change-Id: I419d4b734921fdb31e562a62a48786d196ebb960
sungwook79.park [Wed, 27 Sep 2017 11:54:57 +0000 (20:54 +0900)]
Add Tizen .NET API Guide for Tizen.Uix.InputMethod
PS3: Reviewed
Change-Id: I178b94c61e0b14d345ca4f24105714531138a7e6
Signed-off-by: sungwook79.park <sungwook79.park@samsung.com>
Szymon Jastrzebski [Wed, 11 Oct 2017 10:02:36 +0000 (12:02 +0200)]
[Application] Updating getBatteryUsageInfo() and getAppsUsageInfo() methods
+ New native feature key http://tizen.org/feature/app_history is
being introduced into Tizen 4.0, this requires to add it into the
'Related Feature' section.
+ Currently, mentioned methods are available only on mobile profile,
now we can expand it to wearable profile.
PS3: Reviewed
Change-Id: I0ddce465b1ad0d2df227d94a8530979e499d3c77
Signed-off-by: Szymon Jastrzebski <s.jastrzebsk@partner.samsung.com>
Inkyun Kil [Fri, 29 Sep 2017 02:50:29 +0000 (11:50 +0900)]
Add guide document for DataControl of dotnet
PS3: Reviewed
Change-Id: I8e6ef116a45240dc6d4614ce204a0010f9c191e5
Signed-off-by: Inkyun Kil <inkyun.kil@samsung.com>
Lukasz Pik [Thu, 5 Oct 2017 10:45:29 +0000 (12:45 +0200)]
Added format module guide
PS4: Reviewed
PS5: Rebase
Change-Id: I27e2a37e7a1c008704c7cb9fa866013af195de83
Signed-off-by: Lukasz Pik <lu.pik@samsung.com>
Editor Lionbridge [Wed, 11 Oct 2017 05:46:44 +0000 (08:46 +0300)]
Add Known issue, UI Builder does not open layout.xml file
This is a manual cherry pick of change #154360 in the tizen_3.0
branch.
Change-Id: I6bbca42c4deaea00d9979f79e101139e962602cb
Mijin Cho [Wed, 11 Oct 2017 05:07:49 +0000 (05:07 +0000)]
Merge "[TCSACR-88] Add guide for Tizen.Security.PrivacyPrivilegeManager" into tizen
Mijin Cho [Wed, 11 Oct 2017 04:47:14 +0000 (04:47 +0000)]
Merge "Update the emulator manager document" into tizen
coderhyme [Tue, 10 Oct 2017 03:49:23 +0000 (12:49 +0900)]
[Multimedia] Add guide for the AudioManager
PS2: Reviewed
Change-Id: Id58dab10ea2a46493dca70509af390aaeb6e6de0
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Mijin Cho [Tue, 10 Oct 2017 11:11:58 +0000 (11:11 +0000)]
Merge "[Guide] Adding guide for networkbearerselection module" into tizen
Mijin Cho [Tue, 10 Oct 2017 11:00:23 +0000 (11:00 +0000)]
Merge "Add guide documentation of Tizen.Multimedia.Vision" into tizen
Mijin Cho [Tue, 10 Oct 2017 10:41:15 +0000 (10:41 +0000)]
Merge "Add csharp guide for Smartcard" into tizen
Mijin Cho [Tue, 10 Oct 2017 10:25:27 +0000 (10:25 +0000)]
Merge "Add csharp guide for PhonenumberUtils" into tizen
Mijin Cho [Tue, 10 Oct 2017 10:08:08 +0000 (10:08 +0000)]
Merge "Update .NET content" into tizen
Michal Bistyga [Thu, 28 Sep 2017 11:53:00 +0000 (13:53 +0200)]
[Guide] Adding guide for networkbearerselection module
PS5: Reviewed
PS10: Reviewed again after changes
Change-Id: Ia0e5a287d489875a85ff6edd012e312467bced9d
Signed-off-by: Michal Bistyga <m.bistyga@samsung.com>
Signed-off-by: Pawel Wasowski <p.wasowski2@partner.samsung.com>
Mijin Cho [Tue, 10 Oct 2017 09:34:44 +0000 (09:34 +0000)]
Merge "Added alpha index guides" into tizen
Editor Lionbridge [Thu, 5 Oct 2017 12:00:18 +0000 (15:00 +0300)]
Update .NET content
- Synched content with native guides
- Clarified phrases that were incorrect or misleading
- Fixed inconsistent spelling, commas, and articles
PS 2: Add some fix for wrong urls
Change-Id: Ie246d2dc7221fdd99e604edc72ce6e748a1b411b
coderhyme [Tue, 10 Oct 2017 03:34:05 +0000 (12:34 +0900)]
[Multimedia] Add guide for the screen mirroring
PS2: Reviewed
Change-Id: I62aff4979d44c794de0b4446f571fac4ec83ed50
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
sujin921.kim [Tue, 10 Oct 2017 00:26:40 +0000 (09:26 +0900)]
Apply newly released Log View and Remove Connection Explorer View.
- Introduce the newly released UX of Log View.
- Disabled Connection Explorer.
PS2: Reviewed
PS5: Connection Explorer topic removal
Change-Id: I63d747ee40e59183b8ce877ac491e1bdb6c83a3e
Minkee Lee [Fri, 29 Sep 2017 05:19:11 +0000 (14:19 +0900)]
Update the emulator manager document
Add a new feature: In-place emulator install
PS5: Reviewed
Change-Id: I3d1fa374f6115f3cc192a280e3d7b61cb7c7b7e5
Signed-off-by: Minkee Lee <minkee.lee@samsung.com>
Tae-Young Chung [Tue, 26 Sep 2017 07:50:07 +0000 (16:50 +0900)]
Add guide documentation of Tizen.Multimedia.Vision
PS4: Reviewed
PS6: Added the gateway topic back in.
PS7: Synced the gateway topic with the native version
Change-Id: I69254bd7c1378cb16c40930e82266c2c235fab31
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
Mijin Cho [Tue, 10 Oct 2017 05:08:37 +0000 (05:08 +0000)]
Merge "[DataControl] Add remark and ServiceNotAvailableError" into tizen
Mijin Cho [Tue, 10 Oct 2017 04:35:48 +0000 (04:35 +0000)]
Merge "Update 4.0-specific Training content" into tizen