[automerger skipped] Merge "Moving /odm/build.prop to /odm/etc/buid.prop" into...
[automerger skipped] Merge "Moving /odm/build.prop to /odm/etc/buid.prop" into qt-dev am: b36b54cf am: 56e404c4 -s ours
am: 43041d05 -s ours
am skip reason: change_id I0733c277baa67c549bb45599abb70aba13fbdbcf with SHA1 c49655b2 is in history
Change-Id: Ie6e82bd0a30996b385ecafed96cc7b09290cf4b5