OSDN Git Service

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

Change-Id: Ia05ad1bd28156ded61f6b8e04e4eeb781610e561


Trivial merge