OSDN Git Service

resolved conflicts for merge of ec42199a to klp-modular-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Fri, 18 Apr 2014 22:56:46 +0000 (15:56 -0700)
committerElliott Hughes <enh@google.com>
Fri, 18 Apr 2014 22:56:46 +0000 (15:56 -0700)
commit56ca82191231f3aba1132e3db06e7e09a10ec6dc
treebc1fb58074d536961b71686fec951fb28595fdd6
parent235fd3c9effc63643db356a593e7f77f220a5f4c
parentec42199a71c8309a431c22ee152806736c862c4b
resolved conflicts for merge of ec42199a to klp-modular-dev-plus-aosp

Change-Id: I9ecd5d51be4d073ab93dbb0bd60097735e76bf94
tools/aapt/Bundle.h
tools/aapt/Command.cpp