| commit | f2a6f5c2997a8ddbb5460db8e9d347cc7e192b61 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 11:49:46 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 11:49:46 2013 -0700 |
| tree | 723df88dec3a469f9415cf6a1bd0abca1b8ed35d | |
| parent | 451c27ad8fc0b9899a457bf419522486bce336c1 [diff] | |
| parent | f31ad231bb1c7b67be7ae7953509e467d03e00ab [diff] |
am f31ad231: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'f31ad231bb1c7b67be7ae7953509e467d03e00ab': White list file names and do not allow ".."