Skip to content
Commit 3256c9ce authored by junyulai's avatar junyulai Committed by Automerger Merge Worker
Browse files

[automerger skipped] Add getAllCollapsedRatTypes to NetworkTemplate am:... 

[automerger skipped] Add getAllCollapsedRatTypes to NetworkTemplate am: 5cbd1a75 am: 6124af67 -s ours

am skip reason: Change-Id I726e74f5c63a6ed456cb13ea259b58c7a33bec76 with SHA-1 317ba5bf is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397953

Change-Id: I36cacaf70c7a067fc93d01d0f2c89a90cc2694ae
parents dc08329e 6124af67
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