tree bfe25b488eba1d48b8bdde2dd9b2312d8ba17edb
parent 1610206b04c16bccd0847b7af1faa2ece523850e
parent b3c6ece78a171bcf2504808b4a7bd0cc2ce1d9fa
author TreeHugger Robot <treehugger-gerrit@google.com> 1510735674 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1510735674 +0000

Merge "Widget types for unselectable and custom views"