Merge "Fixed UnitTest crash when getting JSON from blank object"
authorsudarshan prasad <sudarshan.prasad@intel.com>
Tue, 16 Dec 2014 18:11:36 +0000 (10:11 -0800)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Tue, 16 Dec 2014 18:11:36 +0000 (10:11 -0800)

Trivial merge