tree e27b11f311dfbaa4b372d5c3d09748446877732f
parent 9f92bc2602204562bc6d241b8c16c7349721a1c0
parent 19628b251da74f85735332421f9d85786a295252
author Chong Zhang <chz@google.com> 1472254102 +0000
committer android-build-merger <android-build-merger@google.com> 1472254102 +0000

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

Change-Id: Iac98c996ba13b59319a12b089be234366a8e7213