OSDN Git Service

Merge \"ResourcesManager: Allow managed addition of library asset paths\" into nyc-dev
authorAdam Lesinski <adamlesinski@google.com>
Wed, 15 Jun 2016 22:44:43 +0000 (22:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Jun 2016 22:44:43 +0000 (22:44 +0000)
am: 464bda8a2b

Change-Id: I352c56482aca030efab49ca39301679b51e44e05

1  2 
libs/androidfw/ResourceTypes.cpp

Simple merge