tree 9eaa8e0204b32deeb9f24f608e6514fb93311d7f
parent 5b3569f5dc2a40ad30b7d8f35ffea6d6396073b7
parent 6e85bdeea0e49612b086e84b699b52f8e7d72b04
author Jerome Gaillard <jgaillard@google.com> 1437708843 +0000
committer android-build-merger <android-build-merger@google.com> 1437708843 +0000

Merge "Fix UI for resource component buttons" into studio-1.4-dev automerge: e8764a0
automerge: 6e85bde

* commit '6e85bdeea0e49612b086e84b699b52f8e7d72b04':
  Fix UI for resource component buttons