Google Git
Sign in
android/platform/packages/providers/GoogleContactsProvider/718aaa33fc245bf6d0882b5ab1ca589b57790e2a
commit
718aaa33fc245bf6d0882b5ab1ca589b57790e2a
[log]
author
Fred Quintana <[email protected]>
Sun Aug 16 17:18:42 2009 -0700
committer
Android Git Automerger <[email protected]>
Sun Aug 16 17:18:42 2009 -0700
tree
6f97d90b15cda350893f70d70f412bda939f6bb0
parent
577cafe633f5e41958b11fc3f7fd6f8444922c85 [diff]
parent
1cceac6431729061a9957e4f0d6723f5d09ccaab [diff]
am 1cceac64: (-s ours) do not merge: cherrypicked 3e94c563dbc36f6d2b4fb230c6909c4ee9011935 and 577cafe633f5e41958b11fc3f7fd6f8444922c85 from master branch

Merge commit '1cceac6431729061a9957e4f0d6723f5d09ccaab'

* commit '1cceac6431729061a9957e4f0d6723f5d09ccaab':
  do not merge: cherrypicked 3e94c563dbc36f6d2b4fb230c6909c4ee9011935 and 577cafe633f5e41958b11fc3f7fd6f8444922c85 from master branch
tree: 6f97d90b15cda350893f70d70f412bda939f6bb0
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. MODULE_LICENSE_APACHE2
  7. NOTICE