commit 34863cb6161b388d095d25d59c9db60eb8ff8fee
author Robert Shih <robertshih@google.com> Fri May 11 20:50:23 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 11 20:50:23 2018 +0000
tree b67187f2749ea7be25cf54392c61e42c7455abc5
parent 20e00b3f96d564277a244625b6d15d8671c64be5
parent 99cafda204ab17bdfdb5ff8793da25a358e5f02d

Merge changes from topic "am-419f3086-5068-4c88-ba99-be1d6eaaa1da" into oc-dev

* changes:
  [automerger] Speed up id3v2 unsynchronization am: f9d87cc850 am: 4da1490a42 am: 136be01dd9 am: c0367b9433 am: 27d756fbae am: 6801c15049 am: 71e28ba226 am: 1a7bebd207 am: a30a421cc6
  [automerger] Speed up id3v2 unsynchronization am: f9d87cc850 am: 4da1490a42 am: 136be01dd9 am: c0367b9433 am: 27d756fbae am: 6801c15049 am: 71e28ba226 am: 1a7bebd207
  [automerger] Speed up id3v2 unsynchronization am: f9d87cc850 am: 4da1490a42 am: 136be01dd9 am: c0367b9433 am: 27d756fbae am: 6801c15049 am: 71e28ba226
  [automerger] Speed up id3v2 unsynchronization am: f9d87cc850 am: 4da1490a42 am: 136be01dd9 am: c0367b9433 am: 27d756fbae am: 6801c15049
  [automerger] Speed up id3v2 unsynchronization am: f9d87cc850 am: 4da1490a42 am: 136be01dd9 am: c0367b9433 am: 27d756fbae
  [automerger] Speed up id3v2 unsynchronization am: f9d87cc850 am: 4da1490a42 am: 136be01dd9 am: c0367b9433
  [automerger] Speed up id3v2 unsynchronization am: f9d87cc850 am: 4da1490a42 am: 136be01dd9
  [automerger] Speed up id3v2 unsynchronization am: f9d87cc850 am: 4da1490a42
  [automerger] Speed up id3v2 unsynchronization am: f9d87cc850
  Speed up id3v2 unsynchronization