tree 5d195cd371cdf0cf1cc3774eb0a931ca3ff69ee9
parent 0185d435bb70374813b41d2b688e423d758a7b76
parent 367f6a20983d421a91a0df63822858d656b4db87
author Tadashi G. Takaoka <takaoka@google.com> 1539267610 -0700
committer android-build-merger <android-build-merger@google.com> 1539267610 -0700

[automerger skipped] Merge "Revert "DO NOT MERGE: Move AM/WM unit tests out of FrameworksServicesTests to WmTests"" am: e908a1d318  -s ours am: f7a03e7b3a  -s ours
am: 367f6a2098  -s ours

Change-Id: I578294f662be2860da25f0cbc8066c3fb4f49f5a