Merge branch 'master' into tizen_2.1

    [Version]0.0.9.1
    [Title] Release charging-animation_0.0.9.1
    [Problem] N/A
    [Cause] N/A
    [Solution]
    1.Flora license version up
    [Team] Profiling
    [Developer] YongChul Park(yc1216.park)

Change-Id: If1d93fdf0046f2283d821abf6ba4756c9b9f5f96

diff --git a/NOTICE.Flora b/NOTICE.Flora
index 42ac28e..73f7581 100755 (executable)
--- a/NOTICE.Flora
+++ b/NOTICE.Flora
@@ -1,4 +1,4 @@
 Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
 Except as noted, this software is licensed under Flora License, Version 1.1
-Please, see the LICENSE file for Flora License terms and conditions.
+Please, see the LICENSE file for Flora License, Version 1.1 terms and conditions.