OSDN Git Service

Merge "Only purge sound models that violate the new primary key constraint if they...
authorChris Thornton <thorntonc@google.com>
Wed, 19 Oct 2016 01:26:48 +0000 (01:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Oct 2016 01:26:48 +0000 (01:26 +0000)
commit1696610b177bbd0a2972eec3786b09f441cf99ca
treef214b039403014984504cfa0a355cdbc87a1ff14
parent519b7837bb364fd8fbbda7c3d34f761784623f0c
parent23655af58504da83d58c043be79803c271cb9d89
Merge "Only purge sound models that violate the new primary key constraint if they don't contain identical data." into nyc-mr1-dev
am: 23655af585

Change-Id: Idc6e7aeef68d16a13a707968ff3805a6d87b2bc3