tree f3d453494a15b8ab3b303ecd1e2dea783cfd6652
parent 135c379115260f672fec023b0f9a020b8c51302b
parent 02565c3622aa9007d3d5eb4612f200decd05b55c
author Dave Langemak <dlangemak@google.com> 1438311444 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438311444 +0000

am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev

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