Skip to content
Commit 3bd12f7d authored by Louis Chang's avatar Louis Chang Committed by android-build-merger
Browse files

[automerger skipped] Merge "Reduce screen layout in task override...

[automerger skipped] Merge "Reduce screen layout in task override configuration from its parent config" am: 6e12301e am: e5424ec5
am: f03be922  -s ours

Change-Id: If60048af2d5f6929b64d04d59086860d90b77d18
parents c322ec3f f03be922
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment