tree 002be3636ed8a4f12842fc5f328ee3de8904004c
parent bb657cf31c084e1d2c5bcf8cc74a7c25634cc8a3
parent 03125de6b57fc358e14cbcd1798cdf9d3289b72f
author Tao Bao <tbao@google.com> 1436565382 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436565382 +0000

am 03125de6: am c8812493: Merge "Pack file_contexts into target_files zip."

* commit '03125de6b57fc358e14cbcd1798cdf9d3289b72f':
  Pack file_contexts into target_files zip.