tree 78020afe20ff524b3826d4832cace9fadfd93eeb
parent 83ba3e096a1982fddc4577880ab6a2ba0b6b7c2e
parent 8b3ca08a7d3892c76f7153d8c4b84e7fae15ec9e
author Jean-Michel Trivi <jmtrivi@google.com> 1545938909 -0800
committer android-build-merger <android-build-merger@google.com> 1545938909 -0800

Merge "Limit too large scale_change exponent used in adjustTimeSlot" am: cfc6616048
am: 8b3ca08a7d

Change-Id: I42d3b717bb324e560d5ae15265fa9f36d8eb0682