Commits
Dandan Sun committed c033c3656e2
MA-16234 [Android_EVK_8MP_android-10.0_5.4.y] thermal service can't work refine due to merge conflict, gerrit has an error when copy .json file Change-Id: Ic11c60650554e2fc7307d53d28eeaf4bcc9ae848 Signed-off-by: Dandan Sun <dandan.sun@nxp.com> Reviewed-on: http://androidsource.ap.freescale.net/project/11087 Reviewed-by: zhang sanshan <sanshan.zhang@nxp.com>