OSDN Git Service

Merge "Change the type of "hours" from long to double" into oc-dr1-dev am: 1498e86530
authorjackqdyulei <jackqdyulei@google.com>
Thu, 29 Jun 2017 18:46:28 +0000 (18:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Jun 2017 18:46:28 +0000 (18:46 +0000)
am: 595def292b

Change-Id: I7a84119fc64b37c8d6ed32ee05e644f9f860a62e


Trivial merge