tree 2518c316aefb85bf96b20214b8a7e47d8e454eb4
parent 66cbab1f138818bdecbaffc08e6808d9939219aa
parent fea0a3bb6d0e6e4403bf7481e5baaeaf9be91f5b
author Marco Nelissen <marcone@google.com> 1509469132 +0000
committer android-build-merger <android-build-merger@google.com> 1509469132 +0000

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

Change-Id: I742c7ac17992fb59aeeeecadff6c798b55344cc5