Skip to content
Commit 7370f3aa authored by Hugo Benichi's avatar Hugo Benichi Committed by android-build-merger
Browse files

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

am: eb11cc67  -s ours

Change-Id: I4208375ecd299f58216a773ce2abca7ba305d7ea
parents 853f2f0a eb11cc67
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment