Skip to content
Commit f6833c92 authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

[automerger skipped] Merge "Move ApplicationInfo to params in... 

[automerger skipped] Merge "Move ApplicationInfo to params in AppComponentFactory" am: 96dd06a1 am: 13a48e14
am: b2754164 -s ours
am skip reason: change_id I4a4d5af842446a5060083c88a0ac5bec014c0c55 with SHA1 33bd3435 is in history

Change-Id: I7e31dd2e32a81b1ea813b7764a2ec52d2a277428
parents bf7b1dd0 b2754164
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