Merge "Use Activity resources in DecorContext" into nyc-dev
am: 6cc3199

* commit '6cc31990fc1952b9533cf9b695dd287b87a93e82':
  Use Activity resources in DecorContext

Change-Id: I84b65df4644dc08e252a609a0544138228e9e4c9