tree 9c297e58eb231f5a2b7ba0164195aaa33a343acb
parent b0e378000fac0d4a2d5a75d887f5a6733bdab900
parent b9f3d025d8db9da0711daa1691d3bace831b0317
author Sunny Goyal <sunnygoyal@google.com> 1459971100 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1459971100 +0000

Merge "Deleting resources added due to merge conflicts" into ub-launcher3-calgary