tree f568521cca38e03259c27c68ef20e0866d765aba
parent 61c8182e70f8dfb247bf0682c3f38c54ba90ca97
parent 250f40c703cd634dff0585acb2279c7ddd1794b0
author TreeHugger Robot <treehugger-gerrit@google.com> 1495816460 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1495816465 +0000

Merge changes from topic 'am-fbc85c75-5d3b-419b-8eda-1fbdb126a8a7' into ub-launcher3-master

* changes:
  [DO NOT MERGE] Making various icon shape options as non-translatable skipped: 1f5a264fac
  [DO NOT MERGE] Making various icon shape options as non-translatable