OSDN Git Service

am 44a80e20: (-s ours) am c0a4883d: Merge "Prevent overlap of color views in landscap...
authorAdrian Roos <roosa@google.com>
Thu, 27 Aug 2015 10:20:29 +0000 (10:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:20:29 +0000 (10:20 +0000)
* commit '44a80e2013022dea9d7e8bec21f095a19cb6131a':


Trivial merge