tree 2eab0a2d30d427da313c32eb849ed4056477e97a
parent 7b493b064aa93c256e0761e0ef1f129087902463
parent 2991503f8660727ac4ef4f57284034c83f43dca6
author Tao Bao <tbao@google.com> 1522127938 +0000
committer android-build-merger <android-build-merger@google.com> 1522127938 +0000

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

Change-Id: I9af5c16f0822fde7dd5e894b04e81b6a1cfb3dc0