tree c20200657fe43a9667017385e7d8f872bc4edbc5
parent 4a1ade1e8e86f8f8d2f47fce809e0b5e64735c2d
parent 4214d57a4a87dbebc7c937275acc9b54fd718697
author Chiao Cheng <chiaocheng@google.com> 1373479770 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1373479770 -0700

am 4214d57a: am 9c842fcf: White list file names and do not allow ".."

* commit '4214d57a4a87dbebc7c937275acc9b54fd718697':
  White list file names and do not allow ".."