Commit 496d6167 authored by Minseok Choi's avatar Minseok Choi Committed by android-build-merger
Browse files

[automerger skipped] Merge "DO NOT MERGE: Whitelist... 

[automerger skipped] Merge "DO NOT MERGE: Whitelist ACTION_AIRPLANE_MODE_CHANGED into intent_whitelist" into oreo-cts-dev
am: 5f8079aa  -s ours

Change-Id: Ic6cc6364befd0e3ad238778b49d63beed7c0be3e
parents 595e5e0b 5f8079aa
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment