OSDN Git Service

Merge "DO NOT MERGE ANYWHERE: Revert "Revert "Fix the interoperability mechanism...
authorPavlin Radoslavov <pavlin@google.com>
Mon, 24 Jul 2017 23:21:46 +0000 (23:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 24 Jul 2017 23:21:46 +0000 (23:21 +0000)
am: 5074c2f9bf  -s ours

Change-Id: I399e3a6c04c0ba6ac1ccba7055208526be173598


Trivial merge