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