| commit | 5a016488da5ff6c1ecdff0b1febd836cc1711531 | [log] [tgz] |
|---|---|---|
| author | Daisuke Miyakawa <dmiyakawa@google.com> | Thu Oct 08 19:57:36 2009 -0700 |
| committer | Daisuke Miyakawa <dmiyakawa@google.com> | Thu Oct 08 19:57:36 2009 -0700 |
| tree | c17d5060edea4607b46cee52f641cf4e7ae2be4b | |
| parent | b1fdb1d33600f0b2f199068254900b240572e472 [diff] | |
| parent | 5c3e687965a49e4e54196a049337544a6eed61d9 [diff] |
Merge commit 'refs/changes/08/29008/8' of ssh://dmiyakawa@android-git.corp.google.com:29418/platform/frameworks/base into cleanup_import Conflicts: core/java/android/pim/vcard/ContactStruct.java