tree 2607c6838b97b2a57056e9cbfcf09a65604d185d
parent e78b1103af001785fc0424c76a2f502566bdc391
parent af93360ef99a850b903ec6b6e962ab5be3f817b3
author Roland Levillain <rpl@google.com> 1567092887 -0700
committer android-build-merger <android-build-merger@google.com> 1567092887 -0700

Merge changes from topic "check-flattened-art-apex"
am: af93360ef9

Change-Id: I0227444dc4cd2de48e2a1b63fa0a8f02fdd1631d