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

Change-Id: Ibb2546ccecc17e683da9756685b09dc24b73404a


Trivial merge