From: Dan Willemsen Date: Fri, 20 Oct 2017 18:56:24 +0000 (+0000) Subject: Merge "Add link_type for temp_layoutlib" am: d0b0e8cc86 -s ours am: 3130b4e146 ... X-Git-Tag: android-x86-9.0-r1~350^2~27^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=34d05be159c7a1301c0f00be20e714a05a77ec10;p=android-x86%2Fframeworks-base.git Merge "Add link_type for temp_layoutlib" am: d0b0e8cc86 -s ours am: 3130b4e146 -s ours am: d857569fda -s ours am: c2f710ed1f -s ours Change-Id: I7d5ac6aff948f6ff8677e54d159eed17e0d2a9a5 --- 34d05be159c7a1301c0f00be20e714a05a77ec10