[automerger skipped] Battery icon is too large am: b6b29c1af0
am:835fa1fd59-s ours am skip reason: change_id I5e165e953682fcfdebf0d06475bb1abd171684d9 with SHA1c71f996da9is in history Change-Id: Id957b953d148fa80439a955966675b0ecc134c49
This commit is contained in: