OSDN Git Service

am 69c3f457: am dc7fee9f: Set up rules to merge AndroidManifest.xmls
authorYing Wang <wangying@google.com>
Thu, 6 Feb 2014 18:11:51 +0000 (18:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Feb 2014 18:11:51 +0000 (18:11 +0000)
commitdd22aee1f4e7acf935cc640fb5ec4fca8db721c1
tree1baaf3a473bc047a44890f0d852c0a5635267447
parenta42d3a4865785f75da449f6dc28f7d9054ea2418
parent69c3f4570d80eab99bfcab604209dc7bb3ae5537
am 69c3f457: am dc7fee9f: Set up rules to merge AndroidManifest.xmls

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