tree aeb4621ee651c13acedb5161a30a5e2c1a47b856
parent 1dd4dfbfd744665239028a21ff74fd19de3f80f3
parent 45075cf623fc59930594ac27c675cd43e36975b1
author Ying Wang <wangying@android.com> 1442358616 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442358616 +0000

am 45075cf6: Merge "Generate installed-files-vendor.txt"

* commit '45075cf623fc59930594ac27c675cd43e36975b1':
  Generate installed-files-vendor.txt