tree 8bdbedf0e1ebdfa0a1a189b6a135a651d42640b7
parent 6aa29a823a6a297ea6658524ec602b667e934387
parent 2b50b53183b8163744248c0001ea93f61570ed7b
author Sunny Goyal <sunnygoyal@google.com> 1500487715 -0700
committer Sunny Goyal <sunnygoyal@google.com> 1500487715 -0700

Merge commit 'refs/changes/98/2553198/2' of sso://googleplex-android/platform/packages/apps/Launcher3 into am-948a617f-f892-4399-bd5c-3dd472692cca

Change-Id: I4b54791fcaaf09a9aad6774d19645e7d7793c75d