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)
am: 23655af585

Change-Id: Idc6e7aeef68d16a13a707968ff3805a6d87b2bc3


Trivial merge