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

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