tree 678c330fe49f1817c9c86e845ebbc9d61c72e0fc
parent 66db34fbe25ad1759c27af2ecc721e24adcf62ca
parent 8673e303a73dc3b5bc6c3b095b0f29cbbac859df
author Chong Zhang <chz@google.com> 1472254804 +0000
committer android-build-merger <android-build-merger@google.com> 1472254804 +0000

DO NOT MERGE -- Only use saved surface if started by launcher or moved to front am: 813be138ae am: 9f92bc2602
am: 8673e303a7

Change-Id: I34d205de8f368df05e068548a69448da397d2e41