| commit | 69c3f4570d80eab99bfcab604209dc7bb3ae5537 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Feb 06 18:07:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 06 18:07:51 2014 +0000 |
| tree | 36b6030bd6e097939bf23c6b275460156375502e | |
| parent | 6d0899ea4735293cca61661366dd98917f200bb3 [diff] | |
| parent | dc7fee9fbf46ac06c840c7edfd51fbefeece63e4 [diff] |
am dc7fee9f: Set up rules to merge AndroidManifest.xmls * commit 'dc7fee9fbf46ac06c840c7edfd51fbefeece63e4': Set up rules to merge AndroidManifest.xmls