commit | 3649c804e2f846b82dcb9faf7fc9b667ab872742 | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Tue Apr 10 11:03:09 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Apr 10 11:03:09 2018 -0700 |
tree | 88ed0a219be5c1740d0b44f5175801321f711621 | |
parent | f2a6bee1028b7dae1ca9600d2787daa6077a7841 [diff] | |
parent | 09d3aef926baa6b9d2a915d881433b095485c553 [diff] |
[automerger skipped] Merge changes from topic "hidl-system-api" am: 88a2b68252 am: 09d3aef926 -s ours Change-Id: I0be4f97cf2df20d422f5fa8a4498f6f645d05e46