tree 26b42204221109124fd87583156ef47c42980baf
parent 0837eafc583d601311ecebbe8a43fccceebe1a87
parent 474ab2b8bb4afc576263b4b916c90e34008650ff
author Colin Cross <ccross@android.com> 1515010337 +0000
committer android-build-merger <android-build-merger@google.com> 1515010337 +0000

Merge "Export asm-6.0 as device modules" am: ac4db5fb60
am: 474ab2b8bb

Change-Id: I73ba9859a02ad57c638da6e2cce18bd57c773dd4