tree 43ec735df384b552de0afc48ec3199a427593482
parent e1f1c34c098b80d45934701f9ee7d499ee7bfcc2
author Sunny Goyal <sunnygoyal@google.com> 1459970973 -0700
committer Sunny Goyal <sunnygoyal@google.com> 1459970973 -0700

Deleting resources added due to merge conflicts

Change-Id: I26e46e0470c6b2a33a633b69a5f636b30a61dbc7