tree 546f64a5eb44d0aad53145c9fe788e238bb23215
parent 2c684acab5810cf55780457bda7e5c8895ed1037
parent 9c842fcf486ed5c70ca6db3106349aade27751bf
author Chiao Cheng <chiaocheng@google.com> 1373479456 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1373479456 -0700

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

* commit '9c842fcf486ed5c70ca6db3106349aade27751bf':
  White list file names and do not allow ".."