tree e0c04c37e3f3a0ff83a200669270d7467244371c
parent d81df46e80d5957dd50aed5021a2329836079ab5
parent 5f9ac42029150944818cf719d2216d651f326dd4
author Steven Moreland <smoreland@google.com> 1479136955 +0000
committer android-build-merger <android-build-merger@google.com> 1479136955 +0000

Merge "hidl: Update for IFoo::descriptor -> const char *." am: e17e68f139
am: 5f9ac42029

Change-Id: I29e5b04d4737dcc380ac34a0becfe633fc1d51db