tree a83479b27eb040d97ea12196cd3a4129c57ac134
parent 529b7fdf725131362464bc4e4c0b79d56a105cdb
parent 5dbc4a83b9c6ea77dd85720a40de7dfc200ee872
author TreeHugger Robot <treehugger-gerrit@google.com> 1515006681 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1515006681 +0000

Merge "Keep primary icon in the same position regardless of text." into oc-mr1-jetpack-dev