am 63c7a655: am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev

* commit '63c7a655beab21da934d21bb4004889bfb6e4417':
  Deprecate Resources.getDrawable(int) in favor of the two-arg version