diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2012-08-15 08:32:33 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-15 08:32:33 -0700 |
commit | 27d23cd99fcabf111002af3b07752753325bbc64 (patch) | |
tree | 5a86d7a8720a9ad79fb395b04d54385fb5b19ef9 /res/values-es | |
parent | 8830283f3c8289800368b840324d608fbad9981f (diff) | |
parent | 2d85ca3c91d43a7192363b24cf99eac60c7a7904 (diff) | |
download | packages_providers_ContactsProvider-27d23cd99fcabf111002af3b07752753325bbc64.zip packages_providers_ContactsProvider-27d23cd99fcabf111002af3b07752753325bbc64.tar.gz packages_providers_ContactsProvider-27d23cd99fcabf111002af3b07752753325bbc64.tar.bz2 |
am 2d85ca3c: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '2d85ca3c91d43a7192363b24cf99eac60c7a7904':
Diffstat (limited to 'res/values-es')
0 files changed, 0 insertions, 0 deletions