tree 61f1d34aac9298971345c84b2a50f54a36a8f396
parent 73b51ac40d5466e6d7ff1f21644aacd3df4e427c
parent defdb1fd703b496f2f939b123119630606ac8ec7
author Adam Lesinski <adamlesinski@google.com> 1501539446 +0000
committer android-build-merger <android-build-merger@google.com> 1501539446 +0000

Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev
am: defdb1fd70

Change-Id: I16587768d92201f8d4d083b70ae972cca47e8b5c