OSDN Git Service

Merge changes from topic "am-c1e91e5e-2686-4871-b188-107c0ddf3273" into oc-dev am...
authorRyan Mitchell <rtmitchell@google.com>
Thu, 7 Jun 2018 03:49:18 +0000 (20:49 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Jun 2018 03:49:18 +0000 (20:49 -0700)
commit366031e3366649142cf99d6cfbec422d4fac5029
tree32324c9c9d10e5e336d87443cee6f87b8e127e02
parent2b6805fedc69735ee79dcec7ac5d4a5963f202d2
parentdff068e1e8830592925f9873869a4c01a48c6a13
Merge changes from topic "am-c1e91e5e-2686-4871-b188-107c0ddf3273" into oc-dev am: 075bcf73c8
am: dff068e1e8

Change-Id: I562e53f089ca19fc145a34fb539556ae92d05722
libs/androidfw/ResourceTypes.cpp