tree 60ae6c3f1da9d7e2903d295649ddd6f77159bede
parent bcd5680dbcc7a5ed7d82298258b7eea272e1a87d
parent dd4789a548ade3c7d6433784d9354c7e3e187824
author Yifan Hong <elsk@google.com> 1539712288 -0700
committer android-build-merger <android-build-merger@google.com> 1539712288 -0700

CompatibilityMatrix::combine() combines everything correctly am: e7837b164c
am: dd4789a548

Change-Id: I6874463e29a07263b2e428a0c7b39fe0316918b7