[automerger skipped] Merge "Enable bitwise-conditional-parentheses warning" am: 78620004fc
am: d4fff11609
-s ours
am skip reason: Change-Id Ib793e35e1f3098e2cce760bcbf0f115ae5764c7f with SHA-1 de21a358c3
is in history
Change-Id: I1c514a42ba8039c75661ee1f906669e7218ced7d
This commit is contained in: