tree 6c112822bf404ade0d743b9494c113398ab43d2f
parent 3de1fd0a88dd7ef6527166f3600dbab8aa79b937
parent be5bb00900845ad8d977f63f2570b4731c3fbff2
author Marco Nelissen <marcone@google.com> 1509473216 +0000
committer android-build-merger <android-build-merger@google.com> 1509473216 +0000

Merge "Fix edge case when applying id3 unsynchronization" into lmp-dev am: 4c75797abd am: fea0a3bb6d am: f15220d4fc am: 7bccf8fae9 am: 31a2855f12 am: 46bc5d4f0b am: d65e5d3c22 am: 72748f4ee4 am: 6c73780bfe
am: be5bb00900

Change-Id: I0154da7676d243d5a88d5ebbc95e575029c1a903