tree 9f82b247243996929cff21f022c6b4682509aa4e
parent 97574ede5ad5dca95a701bedf83593102984bceb
parent 81300a9f75e34f3cf22b911fb087c528941ed516
author Sunny Goyal <sunnygoyal@google.com> 1475864334 +0000
committer android-build-merger <android-build-merger@google.com> 1475864334 +0000

Merge "Using add/replace instead of update when updating an entry." into ub-launcher3-calgary-polish
am: 81300a9f75

Change-Id: I0e34f2a0b17b702e1e29bbb5f3c73e09811ed1a6