OSDN Git Service

Merge "Add link_type for temp_layoutlib" am: d0b0e8cc86 -s ours am: 3130b4e146 ...
authorDan Willemsen <dwillemsen@google.com>
Fri, 20 Oct 2017 18:45:25 +0000 (18:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 18:45:25 +0000 (18:45 +0000)
commitc2f710ed1f985aac769de23b02de0110db7c5971
treeb8b6458f71902ec8abef43b8370497a631aa5a2f
parent9c798025dd540dca6f4459e9136c499a1f3dbe9d
parentd857569fda4c06f4820576e7a9c67787debc03d6
Merge "Add link_type for temp_layoutlib" am: d0b0e8cc86  -s ours am: 3130b4e146  -s ours
am: d857569fda  -s ours

Change-Id: Ide90033b38ba2d75a5fb08e3078310dda5fec9ac