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)
commitce73bd53ff439f41673e0af29acdda98e59731ed
tree8071f0ae34a3858691691847de3925333f9168fc
parentf61793658ace80205b450be286b2ad6ed32e54d0
parentd84c30ddec75162214634476c181cd41cbe73ac2
Merge "Add support for modifying decay timer."
am: d84c30ddec

Change-Id: Ia05ad1bd28156ded61f6b8e04e4eeb781610e561