am fd28b451: (-s ours) am 1fefe88c: Another attempt at popup assets (hdpi and mdpi)

Merge commit 'fd28b45125f7d58a9d88c0dd09fe610f6e5878df'

* commit 'fd28b45125f7d58a9d88c0dd09fe610f6e5878df':
  Another attempt at popup assets (hdpi and mdpi)