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)
commit3130b4e1461bba2c6b593790ca46679a4946f1a6
treeb3e253e7e56182329e4b292e03a5f8cb46ef030d
parentf9cf2df461a90ca3ddc228c87cef5b4817b99113
parentd0b0e8cc860a7753e94ba25781dd125ef34c255a
Merge "Add link_type for temp_layoutlib"
am: d0b0e8cc86  -s ours

Change-Id: Ic84faa1292e8e52abff9ce62e992e7d00b7cb5e2