Merge "index: Upstream code merge into tizen_3.0" into tizen
authorWoochan Lee <wc0917.lee@samsung.com>
Tue, 26 Apr 2016 08:26:37 +0000 (01:26 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 26 Apr 2016 08:26:37 +0000 (01:26 -0700)

Trivial merge