commit | f34afe881874d9e99b1c67b2ccb6ef75c4df687c | [log] [tgz] |
---|---|---|
author | Yifan Hong <elsk@google.com> | Mon Jul 02 12:59:41 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jul 02 12:59:41 2018 -0700 |
tree | 58c59a04788310be3af0f8ccee88fee6125a220a | |
parent | 8b4662cfc6fa2edcffab952b35b7464ce1a8fcce [diff] | |
parent | 48833e5a4e424147e97d48c3e5c470eca2d66ec5 [diff] |
Merge "Allow multiple DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILEs." am: f3378017ea am: 48833e5a4e Change-Id: I5ffde0d5a1ef806d4b568bc70267677b1db35044