OSDN Git Service

resolved conflicts for merge of 701f9c2f to stage-aosp-master
authorDan Albert <danalbert@google.com>
Thu, 5 Mar 2015 23:41:39 +0000 (15:41 -0800)
committerDan Albert <danalbert@google.com>
Thu, 5 Mar 2015 23:41:39 +0000 (15:41 -0800)
commitf8d6a4ba8739e16e13ae0014efa099ec564939a7
tree3359c566008dcbe79e5553503e37a754fea16b1e
parentecc20aafa6f3d272292e7b3577c99f2c127e590f
parent701f9c2fd8d4e31c5ed3a51e4767d4aeb9b20c40
resolved conflicts for merge of 701f9c2f to stage-aosp-master

Change-Id: I42e0411c0acef4b15137491ecaaed95d9b1cd0c1
tools/aapt/ResourceTable.cpp
tools/aapt/ResourceTable.h