tree b9192dfea73a615be1cb563df2a52188e73bf7f2
parent 61d3d441f3e88d3ffbd25e6efc912e2c9fceaa2d
parent fca6cd0dedab656b01d1b0ec30639bc9d1396680
author Aurimas Liutikas <aurimas@google.com> 1497044283 +0000
committer android-build-merger <android-build-merger@google.com> 1497044283 +0000

Merge "Mark EdgeEffectTests#testOnAbsorb() as @LargeTest" into oc-dev am: fc29bbd78c
am: fca6cd0ded

Change-Id: I6a561fd47409ff156ee9a80e5b507bb1c76da5ff