920d01f80a
Merge commit 'b6e164c779881cf68768224bd67a8d949be0618a' into eclair-plus-aosp * commit 'b6e164c779881cf68768224bd67a8d949be0618a': Per suggestion in http://b/issue?id=2062340, update the UNIQUE in the