Merge \"switch to default Trade Federation ABI class\"
authorJulius D'souza <jdsouza@google.com>
Mon, 25 Jul 2016 20:45:41 +0000 (20:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 20:45:41 +0000 (20:45 +0000)
am: e3235bbd8d

Change-Id: I484047b612b8231c9184d7718c9fac1ee0c91f68


Trivial merge