OSDN Git Service

am dc7fee9f: Set up rules to merge AndroidManifest.xmls
authorYing Wang <wangying@google.com>
Thu, 6 Feb 2014 18:07:51 +0000 (18:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Feb 2014 18:07:51 +0000 (18:07 +0000)
commit69c3f4570d80eab99bfcab604209dc7bb3ae5537
tree36b6030bd6e097939bf23c6b275460156375502e
parent6d0899ea4735293cca61661366dd98917f200bb3
parentdc7fee9fbf46ac06c840c7edfd51fbefeece63e4
am dc7fee9f: Set up rules to merge AndroidManifest.xmls

* commit 'dc7fee9fbf46ac06c840c7edfd51fbefeece63e4':
  Set up rules to merge AndroidManifest.xmls
core/clear_vars.mk
core/config.mk
core/package.mk