jackqdyulei 595def292b Merge "Change the type of "hours" from long to double" into oc-dr1-dev ...

am: 1498e86530

Change-Id: I4bd802fa60da314a7997addbe2920b394d0e4209

2017-06-29 18:41:23 +00:00

..

android/settings

Merge "Change the type of "hours" from long to double" into oc-dr1-dev

2017-06-29 18:41:23 +00:00