OSDN Git Service

Merge "Merge "Add link_type for temp_layoutlib" am: d0b0e8cc86 -s ours am: 3130b4e14...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 20 Oct 2017 18:58:19 +0000 (18:58 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 20 Oct 2017 18:58:19 +0000 (18:58 +0000)

Trivial merge