tree 70f6c6b5d704473d035fab7972c2a0c47c828d6e
parent 5b7aaeaa2e71cac30609263364082f33ce43bfbf
parent 84c5ae523201f17b94b5b0afe85a9af3f26c8231
author Ying Wang <wangying@android.com> 1444871734 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444871734 +0000

am 84c5ae52: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"

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