tree b3e253e7e56182329e4b292e03a5f8cb46ef030d
parent f9cf2df461a90ca3ddc228c87cef5b4817b99113
parent d0b0e8cc860a7753e94ba25781dd125ef34c255a
author Dan Willemsen <dwillemsen@google.com> 1508524078 +0000
committer android-build-merger <android-build-merger@google.com> 1508524078 +0000

Merge "Add link_type for temp_layoutlib"
am: d0b0e8cc86  -s ours

Change-Id: Ic84faa1292e8e52abff9ce62e992e7d00b7cb5e2