OSDN Git Service

resolved conflicts for merge of dd3d95f1 to klp-volantis-dev
authorNick Kralevich <nnk@google.com>
Wed, 12 Feb 2014 22:05:30 +0000 (14:05 -0800)
committerNick Kralevich <nnk@google.com>
Wed, 12 Feb 2014 22:08:06 +0000 (14:08 -0800)
commit1cbea39fe1740d7d1c3e4aa0e4771a99a56c79ef
tree609e7c7ad6a58d44191de97af33a11d9a5e1c78d
parent7594767e55e011101ed9341f01d40730fdbd4cc7
parentdd3d95f182a634acdcc1b1e8e4954234d048eb54
resolved conflicts for merge of dd3d95f1 to klp-volantis-dev

Change-Id: I96c0f0da852a0b3cf8aef9158678d38aa30f456f
include/androidfw/AssetManager.h
include/androidfw/ResourceTypes.h
libs/androidfw/AssetManager.cpp