Merge "switch to default Trade Federation ABI class"
authorJulius D'souza <jdsouza@google.com>
Wed, 13 Jul 2016 18:57:05 +0000 (18:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 13 Jul 2016 18:57:06 +0000 (18:57 +0000)

Trivial merge