am 291389ed: am 5dbc1f64: Merge "Fix use of holo drawables in a few more places"

* commit '291389ed5ce3c97c7f5ec145f00a6bc68862f8f4':
  Fix use of holo drawables in a few more places