[automerger] Fix TrackInfo parcel write am: 0d2dc943dc

author Android Build Merger (Role) <noreply-android-build-merger@google.com>

Fri, 13 Jul 2018 06:56:56 +0000 (06:56 +0000)

committer Android Build Merger (Role) <noreply-android-build-merger@google.com>

Fri, 13 Jul 2018 06:56:56 +0000 (06:56 +0000)
author Android Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 13 Jul 2018 06:56:56 +0000 (06:56 +0000)
committer Android Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 13 Jul 2018 06:56:56 +0000 (06:56 +0000)
diff --cc media/java/android/media/MediaPlayer.java
Simple merge
author	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Fri, 13 Jul 2018 06:56:56 +0000 (06:56 +0000)
committer	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Fri, 13 Jul 2018 06:56:56 +0000 (06:56 +0000)