| commit | 19755fba409cfa2c4517c66e58d994b63de4aefc | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Thu Apr 28 10:56:40 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 28 10:56:40 2011 -0700 |
| tree | 6bf7e10344fe3142ace7206a78553210e78bae71 | |
| parent | 938f93be399efeaa635ac2f80851f0f34ddd9863 [diff] | |
| parent | 8d00b365c5d48e4a3fd7f0d8916e41cec073f852 [diff] |
am 8d00b365: resolved conflicts for merge of 545e9b30 to gingerbread * commit '8d00b365c5d48e4a3fd7f0d8916e41cec073f852': Update lists of Japanese network operators