tree 709d3b2a9fbc61ad6dd07252eb933c872eed5459
parent 27af2de5acb7043888106d25ba029e0cd6208f9c
parent 1f5a264facbcde8a08b79515c483e78f595e7479
author Sunny Goyal <sunnygoyal@google.com> 1495817138 +0000
committer android-build-merger <android-build-merger@google.com> 1495817138 +0000

[DO NOT MERGE] Making various icon shape options as non-translatable
am: 1f5a264fac  -s ours

Change-Id: I296898126ce981103bc8b7e5b8dee58f7c9e0e72