OSDN Git Service

RRO: Synchronize access to overlays.list am: 0fbb608110 am: dce79f10ba
authorMartin Wallgren <martin.wallgren@sonymobile.com>
Wed, 12 Oct 2016 21:15:58 +0000 (21:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Oct 2016 21:15:58 +0000 (21:15 +0000)
am: 3970c44547

Change-Id: I4c9eecad4c2d935a1f1840fed6d70685b82b7e65

1  2 
libs/androidfw/AssetManager.cpp

Simple merge