tree 44097a06c9551e2d67d25232d90b0852f831691a
parent 670b8b597131c35cbd742d94ee1d22ace5d06e51
parent c0a4883d58554c84d10911da20f43be149b47c53
author Adrian Roos <roosa@google.com> 1439403392 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439403392 +0000

am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev

* commit 'c0a4883d58554c84d10911da20f43be149b47c53':
  Prevent overlap of color views in landscape