OSDN Git Service

am dd22aee1: am 69c3f457: am dc7fee9f: Set up rules to merge AndroidManifest.xmls
authorYing Wang <wangying@google.com>
Fri, 21 Feb 2014 18:34:44 +0000 (10:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Feb 2014 18:34:44 +0000 (10:34 -0800)
commit387a095fbd3c375e93c1c77c974f7bbe462933a6
tree46da9cac542e27b228dc52167668d538f36a5826
parent5f4eb0c2eb7ccd2fae4679b1129204129343afb9
parentdd22aee1f4e7acf935cc640fb5ec4fca8db721c1
am dd22aee1: am 69c3f457: am dc7fee9f: Set up rules to merge AndroidManifest.xmls

* commit 'dd22aee1f4e7acf935cc640fb5ec4fca8db721c1':
  Set up rules to merge AndroidManifest.xmls