tree 3690785f8788638d9acd38e5ca06b6cf452202ff
parent 70c6d24c78e120119936bb74270f466a36ba994c
parent 3ea7bee2f49b6edc7ada59dc1a85e81fbdc49843
author Nick <nickjames@google.com> 1532369661 -0700
committer android-build-merger <android-build-merger@google.com> 1532369661 -0700

Merge "Fix ToastTest.testAccessMargin on H watches" into stage-aosp-pi-cts-dev am: 9b337137a7
am: dfedd22954

Change-Id: I6b4ecef6ebfb9906862ae88576fc1bdda50940fe