| commit | bbbe7f148a3ba1e9ee68dcd856bf9a3a425b58a8 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Nov 29 11:53:13 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 11:53:13 2012 -0800 |
| tree | 59b1a31e78660ece1938151db66bdfad4a2fca1c | |
| parent | ecfa7c4591f00e5c8d5a55436555668a7a956d19 [diff] | |
| parent | 7371ecba75f20c28cd04aa01edca16a1e4dcf35e [diff] |
am 7371ecba: Re-do and clean up merges * commit '7371ecba75f20c28cd04aa01edca16a1e4dcf35e': [sample] change apns-full-conf.xml in the EU countries [sample] change apns-full-conf.xm in the ASIA/MEA countries