tree 6089d52cdd039a9166b57ea40001feb2f1d58d34
parent f14b0298f645b03a3f63587a678350741cca7e3d
parent 2af586376d2b99c75a5672c72a704f2031adc0fe
author Steve Fung <stevefung@google.com> 1444933192 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444933192 +0000

am 2af58637: Merge "Add the Product ID to target_files.zip"

* commit '2af586376d2b99c75a5672c72a704f2031adc0fe':
  Add the Product ID to target_files.zip