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

Change-Id: Ic06d0cfb681fa49c9c2712bfbf58b2ddad0af8ee


Trivial merge