tree 9da5118604339b0f23d005dad295dc68d01d7d00
parent 002b475453f4db0ee9de7c09d99a139ccc0e5a13
parent 767a626bc5468c9f4595a524fb2cade2a7dc027f
author Alex Klyubin <klyubin@google.com> 1516340450 +0000
committer android-build-merger <android-build-merger@google.com> 1516340450 +0000

Merge "Add boot.art.rel files to system image" am: eb38b51733 am: 8833703869
am: 767a626bc5

Change-Id: Id1f6f998a4f0e148ed6bcd60f1ba28354b0b8f25