Merge "DO NOT MERGE -- Only use saved surface if started by launcher or moved to front" into nyc-dr1-dev am: 19628b251d am: 80c031cbd4 am: 233b85b79b

am: 9a7dccf534  -s ours

Change-Id: If1ed9f64b6cae04c47f4e5bfd001b78af6ae5553
This commit is contained in:
Chong Zhang
2016-08-31 00:37:19 +00:00
committed by android-build-merger

Diff Content Not Available