tree 302138aef8f58cd554245b9581a506e1fef2fa2b
parent b3dbba59a2fcb89904ddeca77b48c62d6058bbb5
parent 18a5d529cdd94616705b85686b53d2ce07b026a4
author Tao Bao <tbao@google.com> 1541469703 -0800
committer android-build-merger <android-build-merger@google.com> 1541469703 -0800

Merge "ui: Manage loaded resources with smart pointers." am: 06aea3a894
am: 18a5d529cd

Change-Id: I6249fc282220935c344a45f30332a7cfbb6beb8f