tree 6270528674621beae0c2a497ffb811be3fe0c4b4
parent 1624d766649656c7c810693eae9aa35bcc7704ba
parent 614c83d9777b68b304e0fac6ac19e39a4d49d016
author Seigo Nonaka <nona@google.com> 1463100844 +0000
committer android-build-merger <android-build-merger@google.com> 1463100844 +0000

Merge "Fix incorrect inheritance from TextAppearance to Widget." into nyc-dev
am: 614c83d977

* commit '614c83d9777b68b304e0fac6ac19e39a4d49d016':
  Fix incorrect inheritance from TextAppearance to Widget.

Change-Id: Ifdce3f9fa8d3be08b7de6c5afb2d1a74b0437188