summaryrefslogtreecommitdiffstats
path: root/src/com/android/providers
diff options
context:
space:
mode:
authorZheng Fu <zhengfu@google.com>2014-10-01 00:58:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-01 00:58:16 +0000
commite83d280b8646e24e700de249c2215690fe5450ff (patch)
treea8a5152486c62cb3f4784b5c54131082f3597faf /src/com/android/providers
parent92983639e357028e3b0c18bfb9fef41211a4c1f1 (diff)
parent85fa5405a4e6681037355e77295fe4b72bc55167 (diff)
downloadpackages_providers_ContactsProvider-e83d280b8646e24e700de249c2215690fe5450ff.zip
packages_providers_ContactsProvider-e83d280b8646e24e700de249c2215690fe5450ff.tar.gz
packages_providers_ContactsProvider-e83d280b8646e24e700de249c2215690fe5450ff.tar.bz2
am 85fa5405: am 0af7ae49: Merge "DO NOT MERGE synchronize photo storage creation for race conditions." into lmp-dev
* commit '85fa5405a4e6681037355e77295fe4b72bc55167': DO NOT MERGE synchronize photo storage creation for race conditions.
Diffstat (limited to 'src/com/android/providers')
0 files changed, 0 insertions, 0 deletions