Merge "Avoid ambiguous clear colors in fragment_ops.interaction."
authorJarkko Pöyry <jpoyry@google.com>
Mon, 6 Apr 2015 23:21:14 +0000 (23:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 6 Apr 2015 23:21:14 +0000 (23:21 +0000)

Trivial merge