tree 09e80aaceff3f3c0aa189aa4d54b03588dcb6167
parent 46d5eca989fcbc6a3be419216358a2659ba624f9
parent c3829f528e80403d0990707a14fad10b168e67d2
author Adam Lesinski <adamlesinski@google.com> 1468636704 +0000
committer android-build-merger <android-build-merger@google.com> 1468636704 +0000

Merge \"Deprecate Resources constructor and updateConfiguration() method\" into nyc-mr1-dev
am: c3829f528e

Change-Id: I59c4daf39179409cc3195cda9c89ae604ec36af6