tree 2b9edc44bf17cea96ad518103bf9086f3052a925
parent fbe99d6a7f6b9742e9831ee4bfaa0bc804e95c97
parent b786d9a33450b42bf937ca193041e35a11be7ca2
author Chris Banes <chrisbanes@google.com> 1456055272 +0000
committer android-build-merger <android-build-merger@google.com> 1456055272 +0000

Merge "Fix crash on L+ when using TextInputLayout" into mnc-ub-dev
am: b786d9a334

* commit 'b786d9a33450b42bf937ca193041e35a11be7ca2':
  Fix crash on L+ when using TextInputLayout