OSDN Git Service

am 6246ade0: Merge "Remove controlBackground attribute, replace with direct reference...
authorAlan Viverette <alanv@google.com>
Tue, 19 May 2015 17:19:44 +0000 (17:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 19 May 2015 17:19:44 +0000 (17:19 +0000)
* commit '6246ade0b36a1583e254b7aded3b232da9290f6d':
  Remove controlBackground attribute, replace with direct reference


Trivial merge