tree fe4875c992575a188c42f19303690c422cf9adca
parent d926c0f453c483f76b5124d8f1f7b2f09e2b1b27
parent 8b037b6765ac6390e0fe6217aba9eac592f2a108
author Ying Wang <wangying@android.com> 1442371169 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442371169 +0000

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

* commit '8b037b6765ac6390e0fe6217aba9eac592f2a108':
  Generate installed-files-vendor.txt