OSDN Git Service

Merge "Add link_type for temp_layoutlib" am: d0b0e8cc86 -s ours
authorDan Willemsen <dwillemsen@google.com>
Fri, 20 Oct 2017 18:36:10 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 18:36:10 +0000 (18:36 +0000)
commitd857569fda4c06f4820576e7a9c67787debc03d6
treeb4d58817d9c4e995fe978578889d563149ba3b9a
parent33b0f435de3ca632a1a1dc0538d3931176a665bd
parent3130b4e1461bba2c6b593790ca46679a4946f1a6
Merge "Add link_type for temp_layoutlib" am: d0b0e8cc86  -s ours
am: 3130b4e146  -s ours

Change-Id: I8c22645a4148dcbc80f30b6d54ccd4926d4194c1