Skip to content
Commit 26b65abe authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R" am: caa5817c am:... 

Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R" am: caa5817c am: a8a4a460 am: dc2c91f4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e3e891f2104c3363b7e6eb46c12486a76f93d50
parents 06d1d108 dc2c91f4
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