tree 2eab0a2d30d427da313c32eb849ed4056477e97a
parent f7e8012be3c2ac4460b577157e377cd695d411ef
parent 1da2937623f338cafa22f0273e9864284cac629f
author Tao Bao <tbao@google.com> 1522125994 +0000
committer android-build-merger <android-build-merger@google.com> 1522125994 +0000

[automerger skipped] Merge "Specify a default module for TARGET_RECOVERY_UI_LIB." am: 9010493189
am: 1da2937623  -s ours

Change-Id: I1bebe4afbcc4e47860f13c82cea5bfc18e90ca7a