Merge "DO NOT MERGE TokenBucket for rate-limiting and throttling" into nyc-mr2-dev am: d4f09b83bd

am: eb11cc679a  -s ours

Change-Id: I4208375ecd299f58216a773ce2abca7ba305d7ea
This commit is contained in:
Hugo Benichi
2016-12-13 04:19:22 +00:00
committed by android-build-merger

Diff Content Not Available