commit | 6213e25bca9b28f5035ff0414c4a8d2de1a7b179 | [log] [tgz] |
---|---|---|
author | Yahan Zhou <yahan@google.com> | Tue Feb 20 17:49:28 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Feb 20 17:49:28 2018 +0000 |
tree | d829f76cb81ff9a840abf2e0eeffdb403fb5b307 | |
parent | 9f4b493623a31aae53c32c9409e6512327cb1267 [diff] | |
parent | c1d472ca30d932f0c505b34a6105ce05d3f87993 [diff] |
Merge "Merge "Wait for valid state in testShowWhenLockedActivityAndPipActivity" into oreo-mr1-cts-dev am: 37cc5edfb4" am: 9c4b0bf417 am: c1d472ca30 -s ours Change-Id: Ifc130cd7a9d81b7aafb2b444d9f1a1c625a96b4a