diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2013-07-11 11:49:46 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-11 11:49:46 -0700 |
commit | f2a6f5c2997a8ddbb5460db8e9d347cc7e192b61 (patch) | |
tree | 723df88dec3a469f9415cf6a1bd0abca1b8ed35d | |
parent | 451c27ad8fc0b9899a457bf419522486bce336c1 (diff) | |
parent | f31ad231bb1c7b67be7ae7953509e467d03e00ab (diff) | |
download | ContactsProvider-f2a6f5c2997a8ddbb5460db8e9d347cc7e192b61.tar.gz |
am f31ad231: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'f31ad231bb1c7b67be7ae7953509e467d03e00ab':
White list file names and do not allow ".."
0 files changed, 0 insertions, 0 deletions