tree 1f1c00b1abc5c71f51b2e0d116e5b4a8e035eaa4
parent b85a0c70cefc92ddadbfbec0c47967deb6ba9968
author Amit Mahajan <amitmahajan@google.com> 1428945403 -0700
committer Amit Mahajan <amitmahajan@google.com> 1429726903 -0700

Fixing the the conditions checked when searching conflicting row in db.

Bug: 20170255
Change-Id: I4846b009ae82482a078d2b4c2b72eccd38db003c