am 459a3cbe: am 2e104047: am b93b9361: (-s ours) am d055b32f: Remove white gradient...
authorMika Isojärvi <misojarvi@google.com>
Thu, 27 Aug 2015 21:00:20 +0000 (21:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 21:00:20 +0000 (21:00 +0000)
* commit '459a3cbe3c7a9140c6cfac6a180a69c7dfceae6a':


Trivial merge