[automerger skipped] Merge "Fix V1_2::IDevice::getType documentation: was...

[automerger skipped] Merge "Fix V1_2::IDevice::getType documentation: was @param instead of @return" am: 15b826ad am: c9981f95 am: 1da8ae37 am: 39a515e2
am: f35dc874 -s ours
am skip reason: change_id I45d1320a9edae73cde7d9ccaca57b5b9519b0210 with SHA1 c7cdd550 is in history

Change-Id: I83d38dbb9ea0fe4a9e7245b6e83b53353757f2a2