[go: nahoru, domu]

[automerger skipped] Merge "add java_api_finder plugin to mainline module Media to generate java APIs used by Media." into qt-dev am: 01dfc10948 am: d122386e45 am: 73e56642fd
am: 9532ad211f -s ours
am skip reason: change_id I3cdfe5e00394c6ff7b9c857f63a5e45ac79f8d24 with SHA1 6eff1d439b is in history

Change-Id: I40fa7a0d9eee9dd143af86d3b1c604b006d1bd8f