tree bd20750ec1182f83c8eb1268be500bdfb0c3d060
parent 11c3af70e14f7adcaa593af6e31667a6f1b6c313
parent 44526c44caf11a34accf6a32137581553811e88b
author Hugh Chen <hughchen@google.com> 1525835656 -0700
committer android-build-merger <android-build-merger@google.com> 1525835656 -0700

[automerger skipped] Merge "Change the title when in call/media state" into pi-dev am: 32adc82c8a
am: 44526c44ca  -s ours

Change-Id: I464549ce35281bcb57e15fddacf2d21ee83b1d66