tree 7cef5f164cb043a88d32b2aa7be352d7c09e871f
parent 47883d1b2793a089d0b70f187ebd0f29efced7d2
parent cdca6fe8a6d18d1533829b9bfb88ce26a2db7b67
author Adam Lesinski <adamlesinski@google.com> 1465507854 +0000
committer android-build-merger <android-build-merger@google.com> 1465507854 +0000

Merge \\"ResourcesManager: Apply ContextThemeWrapper config\\" into nyc-dev am: 9e9c78f8ce
am: cdca6fe8a6

Change-Id: I376bb2b43e31cb6078290c7fff4838c46ee8d2ca