[automerger skipped] Merge changes from topic "natt-aidl+aidl-freeze" into qt-dev

Browse Source

am: 65caa406e7 -s ours
am skip reason: change_id I9b9a51dc5dc06c90229fb36c34c24258991c4146 with SHA1 47c7eec480 is in history

Change-Id: Ie1cdb9a928f97681ab4083b68db3fd453b0399e5

...

This commit is contained in:

Aaron Huang

2019-04-30 11:24:17 -07:00

committed by android-build-merger

parent 135cfd86f0 65caa406e7

commit a1a4c9d587

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available