[automerger skipped] Merge "Change the string of Captions and reorder the feature in audio category" into qt-dev am: 4b7d48320c
am:c5b6fda98c-s ours am skip reason: change_id I4bcde9c52b4ed3484727e79758ef37f4b05a209d with SHA123c53ad504is in history Change-Id: Icb930088f758049f25618555864c7f6503a22796
This commit is contained in: