tree e44a6fb546163b28a319fb28bcf8381bcd1e3c5c
parent a64eb7c6980130136b9e503e5fb7a4d943aa09c5
parent bda7444958ca64b642e0c9d42c23994187b862fa
author Yifan Hong <elsk@google.com> 1495211774 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1495211775 +0000

Merge "Add <interface> / <instance> to fwk compat mat" into oc-dev