tree 7a6d4809af54e4ff105080cc071a5865c6c6d7a8
parent 74c76a2c593881f3cf810a194befb3083cf3e8d6
parent cbadaa42a2320dd299de0561eacc0f85e24e2787
author Anna Trostanetski <atrost@google.com> 1566388560 -0700
committer android-build-merger <android-build-merger@google.com> 1566388560 -0700

Merge "Add a platform-compat-config to the framework services." am: 6162efbfa7 am: 8ee5669a5e am: 8c41982cbe am: 6333182547
am: cbadaa42a2

Change-Id: I23f9f1adc2d83ad9cbd13532ff3c7598f2457c3a