tree 7319ab52ad4ee7baf29892b362b1aee55c259649
parent 7cfa902dd4415d44452b416e94331db3f032ca83
parent b41b8369687025fe8d661eae8928cbbd9733da21
author Sunny Goyal <sunnygoyal@google.com> 1435279327 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435279327 +0000

am b41b8369: Merge "Enabling translation for preference string" into ub-launcher3-burnaby

* commit 'b41b8369687025fe8d661eae8928cbbd9733da21':
  Enabling translation for preference string