tree 4f00905e5f929528873a5ba6bd480eb15323c07f
parent a2ba194dea1dfc3b982a7db5e5e3c51846f8b962
parent 1d73da2e93a57105e14d0f343f8d567401d18dcf
author Shinichiro Hamaji <hamaji@google.com> 1463460035 +0000
committer android-build-merger <android-build-merger@google.com> 1463460035 +0000

Merge "Add an included assembly file to prerequisites" am: 9a1e6a1932 am: 3d2b180267
am: 1d73da2e93

* commit '1d73da2e93a57105e14d0f343f8d567401d18dcf':
  Add an included assembly file to prerequisites

Change-Id: I47b881bde6bec7456968a6282846acb848bfcdef