Merge "Add null check and fix API reference"
authorJongkyu Koo <jk.koo@samsung.com>
Mon, 4 Sep 2017 10:02:00 +0000 (10:02 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 4 Sep 2017 10:02:00 +0000 (10:02 +0000)

Trivial merge