tree 5b5d316975f7ebf0d9638b5cf7fac7c4df82735c
parent b10c87e1e2d9f638be32bb6c7a0fec61e3fce9c4
parent 570881ef0da58007698fe59d55f8c3ae0104009e
author android-build-prod (mdb) <android-build-team-robot@google.com> 1525294828 -0700
committer android-build-merger <android-build-merger@google.com> 1525294828 -0700

Merge "Accept TARGET_DEVICE_DIR preserved from previous product load" am: 79babfacaa
am: 570881ef0d

Change-Id: Iaeeceb82312f40eee05fa98284e315e159bf49c4