tree 69b00e99ea546a6a9049a142f52fc1a049910905
parent 42dcb27402dcb63742276ed0ff81a1eb4d57d100
parent efe941587a48cb660ed0ab60b72d5b9141824429
author Connor O'Brien <connoro@google.com> 1481656763 +0000
committer android-build-merger <android-build-merger@google.com> 1481656763 +0000

Merge "consumerir: define the consumerir HIDL interface" am: 8af27124a3
am: efe941587a

Change-Id: I124c545dcb96efc60e7c6262cf6fc8412a5de5f9