tree b5f53a331cd31344930339490cb05c8b0862cd4d
parent bdd0e4c0efcd93d37b84f5a581c7f772548016dc
parent 7cf2559774b5cbb2f9c7ca8958c2779f52746039
author Amit Mahajan <amitmahajan@google.com> 1487044380 +0000
committer android-build-merger <android-build-merger@google.com> 1487044380 +0000

Merge "Fix to handle hidl_string correctly in error scenarios." am: 640e1ddb6d
am: 7cf2559774

Change-Id: I358c13cd14b8021d6297e22cdde239a88b9e3439