Merge branch 'upstream' into tizen 06/26706/1 accepted/tizen_3.0.2014.q3_common accepted/tizen_common accepted/tizen_mobile accepted/tizen_tv accepted/tizen_wearable tizen tizen_3.0.2014.q3_common tizen_3.0.2014.q4_common tizen_3.0.2015.q1_common tizen_3.0.2015.q2_common accepted/tizen/common/20140828.081907 submit/tizen/20140828.043810 submit/tizen_mobile/20141120.000000 tizen_3.0.2014.q3_common_release
authorSooChan Lim <sc1.lim@samsung.com>
Thu, 28 Aug 2014 04:28:50 +0000 (13:28 +0900)
committerSooChan Lim <sc1.lim@samsung.com>
Thu, 28 Aug 2014 04:28:50 +0000 (13:28 +0900)
commit025f1de7703a68e912eec0f11152f30d2b37724d
tree84baf7f76c87082d1057978acdda022861484d37
parent177e52c2fa07ccbca697906668b8a92a69b14be1
parent0e1f6f6e7c38278285c694ab811fd06dc775f845
Merge branch 'upstream' into tizen

Conflicts:
.gitignore

Change-Id: I682bb48e72ab7ac5ce413aca4819c25c126552f9