Commit b0fb644c authored by Yifan Hong's avatar Yifan Hong
Browse files

Merge PPR1.180517.004 

Conflicts:
	services/core/java/com/android/server/am/ActivityRecord.java
	services/core/java/com/android/server/audio/AudioService.java

Change-Id: I21e09fc0548f0dd1d62fd06598be1556dd006974
parents f4798670 3d662bf4
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment