tree f124f852d0cf18edf986f9aedfa378cb6ad026f3
parent 24edc281a63114ea9187502a12edb12b8e65b26b
parent 942672d82b7be88c252ff4c979039eb40349cef0
author Ying Wang <wangying@android.com> 1442359271 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442359271 +0000

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

* commit '942672d82b7be88c252ff4c979039eb40349cef0':
  Generate installed-files-vendor.txt