OSDN Git Service

Merge "Add link_type for temp_layoutlib"
authorDan Willemsen <dwillemsen@google.com>
Fri, 20 Oct 2017 18:27:58 +0000 (18:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 18:27:58 +0000 (18:27 +0000)
am: d0b0e8cc86  -s ours

Change-Id: Ic84faa1292e8e52abff9ce62e992e7d00b7cb5e2


Trivial merge