tree 4e293f557c5f15fd8ad8c7d62bafc3a936dc3adb
parent e886392c37a24e25ee1b0e439d74e9b07df2d608
parent 4eec22a6627927aaa11a67e3e18d36534af81856
author Ying Wang <wangying@google.com> 1424973847 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424973847 +0000

am 4eec22a6: Merge "Use a less freqent dummy file name: zipdummy"

* commit '4eec22a6627927aaa11a67e3e18d36534af81856':
  Use a less freqent dummy file name: zipdummy