tree 1fc638e6f03adb69ba2a9a96add88884d9bc1c8e
parent 7178a4b4feddf9a56fd5f70cc18ade1e504bc3a8
parent 3b31df70ea2e9ea5f48468d5155cf90ec87d2842
author Sunny Goyal <sunnygoyal@google.com> 1491849714 +0000
committer android-build-merger <android-build-merger@google.com> 1491849714 +0000

Merge "Marking icon paths as non-translatable" into ub-launcher3-dorval
am: 3b31df70ea

Change-Id: I1130bc6e1a55f92ded5e44fd2c571e8d47013099