tree eb54fa62964135f98bcb04ba16dce6885582aa3c
parent db7140b5193d2ea280f14ba8b18b905fb0213a28
parent e5c09e42eb6c5cb58806b0a5bfc8b77613538cba
author Alison Cichowlas <asc@google.com> 1498681031 +0000
committer android-build-merger <android-build-merger@google.com> 1498681031 +0000

Merge "Disable failing RoundedCornersTest" into oc-dr1-dev
am: e5c09e42eb

Change-Id: I7924f3e138bdd26e47e6f1c0c7f2526abc0b52f5