OSDN Git Service

Merge "Add support for modifying decay timer." am: d84c30ddec am: ce73bd53ff
authorChristopher Ferris <cferris@google.com>
Tue, 16 May 2017 14:26:29 +0000 (14:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 May 2017 14:26:29 +0000 (14:26 +0000)
am: b3f0c2a090

Change-Id: I3ca1b1c77d4d1b87f5b49285e05d11dfdc98cbac


Trivial merge