tree ddba8db034a618312524d6cf1252d766990d96c8
parent cfea184d6c0268b92ed55276d2b686962c8ee531
author Matthew Williams <mjwilliams@google.com> 1445022091 -0700
committer Matthew Williams <mjwilliams@google.com> 1445367330 +0000

DO NOT MERGE Sync extras bundle comparison can throw NPE

BUG: 23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit 9ad2c8403354a985258c098681067e74b9e2f638)