tree 4ad19e8024378b766bf4fb7ca74d74595dd37e37
parent 27e85f974b8e2a35af802e46c9901a56ccfa62f0
parent 6e68ffc27ddc6481dd5afe7297c92be9fdec3cd2
author Tadashi G. Takaoka <takaoka@google.com> 1537514379 -0700
committer android-build-merger <android-build-merger@google.com> 1537514379 -0700

[automerger skipped] Merge "DO NOT MERGE: Move AM/WM unit tests out of FrameworksServicesTests to WmTests" am: be42bd86f7  -s ours
am: 6e68ffc27d  -s ours

Change-Id: Icc4111c3024fb71cee04bd272cbf2123d0563791