[automerger skipped] Merge changes from topic "update_battery_icon" into qt-qpr1-dev am: c08f70b7dd
am:edb8dd6140
-s ours am skip reason: change_id Ifa9a31750b9a926e09aec9262aa89e8de66c91e2 with SHA13dd4f2cc19
is in history Change-Id: I8ef3f7e7084e88f5a853422c004ac702e15136d7
This commit is contained in: