tree 245c4180633f4fe18684cb9aeac61b48d75efc1e
parent e98ba7e175b835e9a4fe9ec5b98e19218df5e751
parent 66cff122cc6d123b947be5f28186dc233a7be1aa
author Dave Langemak <dlangemak@google.com> 1438313030 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438313030 +0000

am 66cff122: am 2e802cac: am 72dcb47d: am b880a036: am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev

* commit '66cff122cc6d123b947be5f28186dc233a7be1aa':
  Make DateTimeView more robust to weird contexts.
  Make the RemoteViews context safe for Icons.