tree fe36d3333bf8d08c4d2223c3bc9f205bff141d76
parent 39f295daeeaefa5667ecd5d1396b51a6a272608f
parent ee299938bf67772efa38544cd2b4475e3fe7269f
author Ying Wang <wangying@android.com> 1444860133 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444860133 +0000

am ee299938: am 5d012538: am 37572684: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"

* commit 'ee299938bf67772efa38544cd2b4475e3fe7269f':
  Use @arg-lsit-file for jar in add-carried-jack-resources