| commit | d49c701904d55ac043d6652c75bce0c8c195045e | [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 | 4d8a57bdd445ec07fe3c381bf1e9c7e28735499d | |
| parent | 989fafc6ad6382969bded271706eeb06eacb7d31 [diff] | |
| parent | 2af5cbee62bf56435c77ca104cd05973722ec12e [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