]> git.saurik.com Git - android/aapt.git/commit
resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Tue, 1 May 2012 16:53:48 +0000 (09:53 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 1 May 2012 16:54:38 +0000 (09:54 -0700)
commit56918fa3750fca8d91eaa99d1d21f0cdca3dbc5e
treed65645e482d8212f26ad7d5e92ed7f9e564359c1
parentec94a847fa1fe53d8f41500baec0a8f5980c9b8b
parente67c8dcb7c948a537398473b51f8e187caa675ac
resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp

Change-Id: I5386585e473201268c6ed8b05e0a16569d434ea2
Bundle.h
ResourceTable.cpp