tree 1590dde278cffbd8715965638f140a550be6da88
parent 7789521f4705a324f1a5013ef1207fabcb8f2fca
parent ebeeea7e74bfd54690622e2aa1b954297f12cc33
author Kirill Grouchnikov <kirillg@google.com> 1510250465 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1510250465 +0000

Merge changes from topic "am-65a73b8f-2f54-4296-9ab8-02654496f096"

* changes:
  [automerger] Support for custom view inflaters in appcompat am: 3f27daae51
  Support for custom view inflaters in appcompat