tree b1116b93485f994a02145f017c2efa9f80431eb9
parent d4c1c74d750fbad693e817622a77c3ce48d05a44
parent 56cb7b61ca39ae1ce155ad347e07b4b1f3fc7517
author Cassie Han <xih@google.com> 1521588468 +0000
committer android-build-merger <android-build-merger@google.com> 1521588468 +0000

Merge "Cherrypick 'Change the MAX_SEARCH_TIME_SEC to 300 secs.'" am: 608cd4f173
am: 56cb7b61ca  -s ours

Change-Id: I91503e9276f20cbcd0d264f15f619b6d3dbe43c8