tree 0895d6b91e2820a48ca7ba2059a3da73a08ae143
parent b845700dee4e604751b26a4268377646ee1eb899
parent 52737f9266dbd5f7cb242d9942c1065293ac3666
author TreeHugger Robot <treehugger-gerrit@google.com> 1500940348 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1500940348 +0000

Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev