[automerger skipped] Merge "Adds new HardwareBuffer plane-locking functions to...
[automerger skipped] Merge "Adds new HardwareBuffer plane-locking functions to NDK" into qt-dev am: 186800de
am: 44c58c2d -s ours
am skip reason: change_id I8b97cdf8e7348e0c00f4ec62cbeb471ea4e00795 with SHA1 75a0a91c is in history
Change-Id: I1e6aacb674b6109897e1600e12599b4549b5824f