tree 7c90855de60034b242afebd193883cfe524088b8
parent 40cca63e2198981fbca1115f372a043851e2be06
parent 75a1919259fc7a327c5227f6618974a9f4185f26
author Raj Mamadgi <r.mamadgi@samsung.com> 1502860602 +0000
committer android-build-merger <android-build-merger@google.com> 1502860602 +0000

Merge "Fix for testActivityLifeCycleOnResizeFreeformTask" into nougat-mr1-cts-dev
am: 75a1919259

Change-Id: I5c5354ac596a2be5e1b9286a35cb0a8d4aa4110a