tree cd8fc0d3518c8fbcc887ea5a1bbe0e484c83e12c
parent a1b843c2b6f66809aae2ab20779ae245a6a968a7
parent 66d4710933593c73f1de644b2e170d5b1884ffac
author Isaac Chen <ycchen@google.com> 1495506464 +0000
committer android-build-merger <android-build-merger@google.com> 1495506464 +0000

Merge "Generic AOSP system image for non-A/B arm devices" into oc-dev
am: 66d4710933

Change-Id: I9d264f8e5a08984813e95b168eba8599b23ea521