[automerger skipped] Merge "Gatekeeper generated aidl cpp bindings" am: ecf4d59309 am: 2778916c99 -s ours
am:8479242fe8-s ours am skip reason: change_id Ie3583f5682727b1f9a82d270764c94fce33388ec with SHA1e7a87a9b06is in history Change-Id: Ibb260fb001f33d24164ef9bf062fb19567896398
This commit is contained in: