tree 19d7e808e2f22ae9fadf9d579f9b11017adab478
parent 1efcfc30b18d926f803ab37812d5384f78063201
parent 23e15b78ad2ad036d2146e4c23d73b5e43844eab
author Daniel Rosenberg <drosen@google.com> 1553653347 -0700
committer android-build-merger <android-build-merger@google.com> 1553653347 -0700

Merge "Fixed min_free_bytes prop name and usleep time default" am: 7522da3036
am: 23e15b78ad

Change-Id: I33e4655486ec05fbd9ea66e467aaa1dce440edf9