[automerger skipped] Merge "Specify a default module for TARGET_RECOVERY_UI_LIB." am: 9010493189
am: 1da2937623 -s ours
Change-Id: I1bebe4afbcc4e47860f13c82cea5bfc18e90ca7a
This commit is contained in: