tree 43729fde0739c361cb1a338919e544f8abbb7606
parent ec57d2287697505e5cd21445c6eec56961c0e993
parent 7bccf8fae931036a7289ff3c0ab79c25482c2420
author Marco Nelissen <marcone@google.com> 1509469376 +0000
committer android-build-merger <android-build-merger@google.com> 1509469376 +0000

Merge "Fix edge case when applying id3 unsynchronization" into lmp-dev am: 4c75797abd am: fea0a3bb6d am: f15220d4fc
am: 7bccf8fae9

Change-Id: I0acac224b4fdd724d1ba0f7ce85808f5e02c9749