| commit | 9b6865f8264a1d83955aba869827b11c29ab0b43 | [log] [tgz] |
|---|---|---|
| author | Evan Charlton <evanc@google.com> | Mon Jul 26 10:31:25 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 26 10:31:25 2010 -0700 |
| tree | c9076ef7ce282ab804a4e86d2b86ca91fa35b8fd | |
| parent | 1812dfdaf494066078ad07ae18a8879827301ada [diff] | |
| parent | 606540b739599c8f079baa2a03b5f0501b148eb2 [diff] |
am 606540b7: resolved conflicts for merge of f2bfa76c to gingerbread-plus-aosp Merge commit '606540b739599c8f079baa2a03b5f0501b148eb2' * commit '606540b739599c8f079baa2a03b5f0501b148eb2': Packages can specify where to find AndroidManifest.xml