tree 5d5c847d6b0ffd34400f2625b7003f8aa40cc14c
parent 2d7df3ef8d0fab3887001f1824a537c98a7a2457
parent 9e25e1645f5e436c88ceab7d7eaf9f21c7fa845b
author Todd Kennedy <toddke@google.com> 1441061872 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441061872 +0000

am 9e25e164: am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev

* commit '9e25e1645f5e436c88ceab7d7eaf9f21c7fa845b':
  Ensure host is set before onInflate()