tree f568521cca38e03259c27c68ef20e0866d765aba
parent 66fc8373640fad7c1c185fe6afce3ec2cf2d1c18
parent 415e2aacf325fbc11be1cb21e0308ebda8fe8d12
author Sunny Goyal <sunnygoyal@google.com> 1495817228 +0000
committer android-build-merger <android-build-merger@google.com> 1495817228 +0000

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

Change-Id: I32b8a89b59b782848b0986dd855747893699bb3b