Merge \\\"switch to default Trade Federation ABI class\\\" am: e3235bbd8d am: 98e547b...
authorJulius D'souza <jdsouza@google.com>
Tue, 22 Aug 2017 17:23:23 +0000 (17:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:23:23 +0000 (17:23 +0000)
am: b93b009dcf

Change-Id: I74e92f6a5b8ce856978ac6924029fb3b108ce68f


Trivial merge